Changeset 830 for MDRepository/trunk/xquery/cmd-model.xqm

Timestamp:

11/02/10 12:06:47 (14 years ago)

Author:

vronk

Message:

introducing init-cache.xql,
proposing search-retrieve queries in the test-suite

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -71 +71 @@
   API function searchRetrieve. 
 :)
-declare function cmd-model:search-retrieve($cql-query as xs:string, $collections as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
-  let $collection := collection($cmd-model:cmdiMirrorPath),
-    $decoded-query := xdb:decode($cql-query),
+declare function cmd-model:search-retrieve($xpath-query as xs:string, $collections as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
+  let $start-time := fn:current-dateTime(),
+  $collection := collection($cmd-model:cmdiMirrorPath),
+    $decoded-query := xdb:decode($xpath-query),
     $sanitized-query := cmd-model:sanitize-query($decoded-query),
     $results :=
@@ -84 +85 @@
     $result-seq := fn:subsequence($results, $start-item, $end-item),
     $seq-count := fn:count($result-seq),
+    $end-time := fn:current-dateTime(),
     $result-fragment :=
     <searchRetrieveResponse>
       <numberOfRecords>{$result-count}</numberOfRecords>
-      <echoedSearchRetrieveRequest>{if ($decoded-query ne $sanitized-query) then "Rewritten to descendant-or-self::CMD" else $cql-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
-      <diagnostics>{$seq-count}</diagnostics>
+      <echoedSearchRetrieveRequest>{if ($decoded-query ne $sanitized-query) then "Rewritten to descendant-or-self::CMD" else $xpath-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
+      <extraResponseData>
+                <returnedRecords>{$seq-count}</returnedRecords>
+                <duration>{$end-time - $start-time}</duration>
+      </extraResponseData>
       <records>
         {$result-seq}