Changeset 833 for MDRepository

Timestamp:

11/02/10 22:25:15 (14 years ago)

Author:

ljo

Message:

cmd-model.xql - searchRetrieve query rewrite first step.

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", $sanitized-query, "/ancestor-or-self::CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']"))
+      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 "Rewritten to descendant-or-self::CMD" 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>
-                <duration>{$end-time - $start-time}</duration>
+        <returnedRecords>{$seq-count}</returnedRecords>
+        <duration>{$end-time - $start-time}</duration>
       </extraResponseData>
       <records>
@@ -110 +110 @@
 
 declare function cmd-model:sanitize-query($query as xs:string) as xs:string {
-if ($query = ("//*", "descendant::element()")) then "/descendant-or-self::CMD" else $query
+let $last-segment := text:groups($query, "/([^/]+)$")[last()]
+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>)") :)
+  else $query
 };