Changeset 570 for MDRepository

Timestamp:

07/05/10 15:35:36 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - handle several collections consistently for get-collection and search-retrieve.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -159 +159 @@
   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? {
+declare function cmd-model:store-collection-data($data as node(), $collection-path as xs:string, $doc-name 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)(: , ()) :)
+      (: util:catch("org.exist.xquery.XPathException", :) xdb:store($collection-path, $doc-name, $data)(: , ()) :)
 };
 
@@ -249 +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
-    ()
+  let $names := if (exists($collections[2])) then
+    ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", $max-depth)) 
   else
-  let $children := for $collection-item in $collections
-                    return 
-                      cmd-model:recurse-collections($collection-item, $max-depth)
-   return
-     cmd-model:store-collection-data(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $collections)
+    ($collections, $cmd-model:collectionDocName),
+ $dummy :=   
+      if (cmd-model:is-doc-available($names[1], $names[2])) then
+        ()
+      else
+        let $children := for $collection-item in $collections
+        return 
+          cmd-model:recurse-collections($collection-item, $max-depth)
+          return
+            cmd-model:store-collection-data(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])
 return 
-cmd-model:serialise-as(cmd-model:get-doc($collections, $cmd-model:collectionDocName), $format)
+  cmd-model:serialise-as(cmd-model:get-doc($names[1], $names[2]), $format)
 };
 
@@ -266 +270 @@
 :)
 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")),
+  let $results := for $coll in $collection return util:eval(fn:concat("collection('", xdb:decode($coll), "')", xdb:decode($cql-query), "/ancestor::CMD")),
     $result-count := fn:count($results),
     $result-seq := fn:subsequence($results, $start-item, $end-item),