Changeset 298 for MDService

Timestamp:

03/26/10 16:43:58 (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) (8 diffs)

MDService/trunk/xquery/cmd-model.xql

@@ -21 +21 @@
       $cmd-index,
     $format := request:get-parameter("format", $cmd-model:responseFormatXml),
-    $collection := fn:concat("/db/cmdi-mirror/", request:get-parameter("collection", "silang_data")),
+    $collection := "/db/cmdi-mirror",
+    $query-model-collection := fn:concat($collection, "/", if (fn:empty(request:get-parameter("collection", ()))) then "silang_data" else ""),
     $max-depth as xs:integer := xs:integer(request:get-parameter("maxdepth", 1))
     return
       if ($operation eq $cmd-model:getCollections) then
-        cmd-model:get-collections($collection, $format, $max-depth)
+        cmd-model:get-collections(fn:concat($collection, if (fn:empty(request:get-parameter("collection", ()))) then "" else fn:concat("/", request:get-parameter("collection", ())), $format, $max-depth)
       else if ($operation eq $cmd-model:queryModel) then
-        cmd-model:query-model($cmd-index-path, $collection, $format, $max-depth)
+        cmd-model:query-model($cmd-index-path, $query-model-collection, $format, $max-depth)
     else if ($operation eq $cmd-model:searchRetrieve) then
       let $cql-query := request:get-parameter("query", "MDGroup/Actors/Actor"),

MDService/trunk/xquery/cmd-model.xqm

@@ -27 +27 @@
 declare variable $cmd-model:responseFormatJSon as xs:string := "json";
 declare variable $cmd-model:responseFormatText as xs:string := "text";
+
+declare variable $cmd-model:collectionDocName as xs:string := "collection.xml";
 
 declare variable $cmd-model:xmlExt as xs:string := ".xml";
@@ -39 +41 @@
   let $text-count-distinct := count(distinct-values($text-nodes))
   return 
-        <Term path="{fn:concat("//", $path)}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{
+        <Term path="{fn:concat("//", $path)}" name="{text:groups($path, "/([^/]+)$")[last()]}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{
           if ($depth > 0) then
             for $elname in $subs[. != '']
@@ -84 +86 @@
             return
               cmd-model:recurse-collections(concat($collection, '/', xs:string($child)), $depth),
-              $current := <Collection>{$collection}</Collection>
+              $current := <Collection name="{text:groups($collection, "/([^/]+)$")[last()]}">{$collection}</Collection>
           return ($current, $child-results)
       else
@@ -114 +116 @@
 
 (:
+ Generic get-doc(collection, docname) 
+:)
+declare function cmd-model:get-doc($collection as xs:string, $doc-name as xs:string) as item()* {
+      fn:doc(fn:concat($collection, "/", $doc-name))
+};
+
+
+(:
   Function for telling wether the result is already available or not.
 :)
 declare function cmd-model:is-result-available($collection as xs:string, $result-ref as xs:string) as xs:boolean {
   fn:doc-available(fn:concat($collection, $result-ref, $cmd-model:xmlExt))
+};
+
+(:
+  Function for telling wether the document is available or not.
+:)
+declare function cmd-model:is-doc-available($collection as xs:string, $doc-name as xs:string) as xs:boolean {
+  fn:doc-available(fn:concat($collection, "/", $doc-name))
 };
 
@@ -137 +154 @@
         let $dummy := util:log('debug', fn:concat('Stores ', $type-name, ' in ', $coll-names))
         return xdb:store($coll-names, cmd-model:make-doc-name($coll-names, $type-name, xs:string($depth), fn:false()), cmd-model:make-doc-element-of-type($type-name, (), $entries, xs:string($depth)))
+};
+
+(:
+  Store the collection listing in give collection.
+:)
+declare function cmd-model:store-collection-data($data as node(), $collection-path as xs:string) as xs:string? {
+  let $clarin-writer := fn:doc("/db/clarin/writer.xml"),
+  $dummy := xdb:login($cmd-model:cmdiDatabaseURI, $clarin-writer//write-user/text(), $clarin-writer//write-user-cred/text())
+  return 
+      (: util:catch("org.exist.xquery.XPathException", :) xdb:store($collection-path, $cmd-model:collectionDocName, $data)(: , ()) :)
 };
 
@@ -195 +222 @@
 };
 
+
+
+
 (:
   Seraliseringsformat. 
@@ -219 +249 @@
 :)
 declare function cmd-model:get-collections($collections as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
+  (: fixme! - collections, is-doc-available only takes one collection.:)
+  let $dummy := if (cmd-model:is-doc-available($collections, $cmd-model:collectionDocName)) then
+    ()
+  else
   let $children := for $collection-item in $collections
                     return 
                       cmd-model:recurse-collections($collection-item, $max-depth)
    return
-     cmd-model:serialise-as(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $format) 
-
+     cmd-model:store-collection-data(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $collections)
+return 
+cmd-model:serialise-as(cmd-model:get-doc($collections, $cmd-model:collectionDocName), $format)
 };
 
@@ -233 +268 @@
   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),
+    $result-seq := fn: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>
+    <searchRetrieveResponse>
+      <numberOfRecords>{$result-count}</numberOfRecords>
+      <echoedSearchRetrieveRequest>{$cql-query, $collection, $start-item, $end-item}</echoedSearchRetrieveRequest>
+      <diagnostics>{$seq-count}</diagnostics>
+      <records>
         {$result-seq}
-        </records>
-</searchRetrieveResponse>
+      </records>
+    </searchRetrieveResponse>
 
     return