Changeset 292 for MDService

Timestamp:

03/26/10 14:23:44 (14 years ago)

Author:

ljo

Message:

First round of searchRetrieve results.

Location:

MDService/trunk/xquery

Files:

• cmd-model.xql (modified) (1 diff)
• cmd-model.xqm (modified) (2 diffs)

MDService/trunk/xquery/cmd-model.xql

@@ -29 +29 @@
         cmd-model:query-model($cmd-index-path, $collection, $format, $max-depth)
     else if ($operation eq $cmd-model:searchRetrieve) then
-      let $cql-query := request:get-parameter("query", "MDGroup/Actors/Actor")
-      return cmd-model:search-retrieve($cql-query)
+      let $cql-query := request:get-parameter("query", "MDGroup/Actors/Actor"),
+        $start-item := request:get-parameter("istart", 1),
+        $end-item := request:get-parameter("iend", 50)
+        
+      return cmd-model:search-retrieve($cql-query, $collection, $format, $start-item, $end-item)
     else 
       <error>Unknown operation</error>

MDService/trunk/xquery/cmd-model.xqm

@@ -198 +198 @@
   Seraliseringsformat. 
 :)
-declare function cmd-model:serialise-as($item as node(), $format as xs:string) as item()? {
+declare function cmd-model:serialise-as($item as node()?, $format as xs:string) as item()? {
       if ($format eq $cmd-model:responseFormatJSon) then
         let $option := util:declare-option("exist:serialize", "method=text media-type=application/json")
@@ -228 +228 @@
 
 (:~
-  API function queryModel. 
-:)
-declare function cmd-model:search-retrieve($cql-query as xs:string, $collection as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
-        cmd-model:serialise-as(<error>Unimplemented</error>, $format)
-
-};
-
+  API function searchRetrieve. 
+:)
+declare function cmd-model:search-retrieve($cql-query as xs:string, $collection as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
+  let $results := util:eval(fn:concat("collection('", xdb:decode($collection), "')", xdb:decode($cql-query), "/ancestor::CMD")),
+    $result-count := fn:count($results),
+    $result-seq := subsequence($results, $start-item, $end-item),
+    $seq-count := fn:count($result-seq),
+    $result-fragment :=
+<searchRetrieveResponse>
+        <numberOfRecords>{$result-count}</numberOfRecords>
+        <echoedSearchRetrieveRequest>{$cql-query, $collection, $start-item, $end-item}</echoedSearchRetrieveRequest>
+        <diagnostics>{$seq-count}</diagnostics>
+        <records>
+        {$result-seq}
+        </records>
+</searchRetrieveResponse>
+
+    return
+        cmd-model:serialise-as($result-fragment, $format)
+
+};
+(:
+{cmdComponent}   //{cmdComponent}        Actor   //Actor
+{cmdPath}.      //{cmdPath}/{cmdComponent}      Actor.Contact.Phone     //Actor/Contact/Phone
+{cmdIndex} {rel} {term}         //{cmdIndex}[\. {rel} '{term}']         Actors.Actor.Sex=f      //Actors/Actor/Sex[.='f']
+{cmdIndex} any {term}   //{cmdIndex}[contains(. '{term}')]      Organisation.Name any University        //Organisation/Name[contains(.,'University')]
+and, or, and not        ?!      Organisation.Name any University and Actor.gender=m     ?! 
+
+//MDGroup[Actors/Actor/Role[.='sponsor'] and Actors/Actor/Name[contains(.,'a')]]
+//Title[starts-with(.,'a')]
+//Title[starts-with(.,'A')]
+//Title[contains(.,'analysis')]
+http://demo.spraakdata.gu.se/clarin/cmd/model/stats?operation=searchRetrieve&query=//Title[contains(.,'analysis')]&collection=
+
+<record>
+  <recordSchema>info:srw/schema/1/dc-v1.1</recordSchema>
+  <recordPacking>xml</recordPacking>
+  <recordData>
+    <srw_dc:dc xmlns:srw_dc="info:srw/schema/1/dc-v1.1">
+     <dc:title>This is a Sample Record</dc:title>
+    </srw_dc:dc>
+  </recordData>
+  <recordPosition>1</recordPosition>
+  <extraRecordData>
+    <rel:score xmlns:rel="info:srw/extensions/2/rel-1.0">
+      0.965
+    </rel:rank>
+   </extraRecordData>
+</record>
+
+<searchRetrieveResponse>
+        <numberOfRecords>integer</numberOfRecords>
+        <echoedSearchRetrieveRequest>query itself (together with the context-collection) </echoedSearchRetrieveRequest>
+        <diagnostics>if necessary</diagnostics>
+        <records>
+                ....
+        </records>
+</searchRetrieveResponse>
+
+:)