Changeset 834 for MDRepository

Timestamp:

11/03/10 09:45:24 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - no need to rewrite to predicate for * etc.

File:

• MDRepository/trunk/xquery/cmd-model.xqm (modified) (3 diffs)

MDRepository/trunk/xquery/cmd-model.xqm

@@ -80 +80 @@
       util:eval(fn:concat("$collection", $sanitized-query, "/ancestor-or-self::CMD"))
     else
-      for $coll in $collections return util:eval(fn:concat("$collection/ft:query(descendant::IsPartOf, <term>", xdb:decode($coll) ,"</term>)/ancestor-or-self::CMD[", $sanitized-query, "]"))
+      for $coll in $collections return util:eval(fn:concat("$collection/ft:query(descendant::IsPartOf, <term>", xdb:decode($coll) ,"</term>)/ancestor-or-self::CMD", $sanitized-query))
 
     let $result-count := fn:count($results),
@@ -89 +89 @@
     <searchRetrieveResponse>
       <numberOfRecords>{$result-count}</numberOfRecords>
-      <echoedSearchRetrieveRequest>{if ($decoded-query ne $sanitized-query) then concat("Rewritten to ", $sanitized-query) else $xpath-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
+      <echoedSearchRetrieveRequest>{if ($decoded-query ne $sanitized-query) then concat("Rewritten to '", $sanitized-query, "'") else $xpath-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
       <extraResponseData>
         <returnedRecords>{$seq-count}</returnedRecords>
@@ -113 +113 @@
 return 
   if ($query = ("//*", "descendant::element()")) then 
-    "/descendant-or-self::CMD" 
+    "" 
   else if ($last-segment = ("Title", "Name", "Role", "Genre", "Country", "Continent", "MdSelfLink", "IsPartOf")) then
-    (: concat("ft:query(",:) if ($query eq concat("//", $last-segment)) then concat("descendant::", $last-segment) else $query (:, ", <regex>.*</regex>)") :)
+    (: concat("ft:query(",:) if ($query eq concat("//", $last-segment)) then concat("[descendant::", $last-segment, "]") else concat("[", $query, "]") (:, ", <regex>.*</regex>)") :)
   else $query
 };