Changeset 707 for MDRepository

Timestamp:

09/20/10 14:16:59 (14 years ago)

Author:

vronk

Message:

should be able to handle empty collection-param

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -30 +30 @@
 declare variable $cmd-model:collectionDocName as xs:string := "collection.xml";
 
+declare variable $cmd-model:collectionRoot as xs:string := "root";
+
 declare variable $cmd-model:xmlExt as xs:string := ".xml";
 
@@ -41 +43 @@
 };
 
-declare function cmd-model:elem-r($collection as xs:string, $path as xs:string, $max-depth as xs:integer, $depth as xs:integer) as element() {
+declare function cmd-model:elem-r($collection as xs:string+, $path as xs:string, $max-depth as xs:integer, $depth as xs:integer) as element() {
   (: let $path-nodes := util:eval(fn:concat("collection('", $collection, "')//", $path)) :)
-  let $path-nodes := for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//CMD[.//IsPartOf='", xdb:decode($coll) ,"']"))
+        let $path-nodes :=
+                if ($collection[1]=$cmd-model:collectionRoot) then
+                                util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//", $path))
+                        else
+                                for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//CMD[.//IsPartOf='", xdb:decode($coll) ,"']//", $path))
+
   let $path-count := count($path-nodes)
     
@@ -250 +257 @@
 
 (:
-  Skapa elementnamn för dokumentet av typ. 
+  Skapa elementnamn för dokumentet av typ. 
 :)
 declare function cmd-model:get-doc-type-element-name($type-name as xs:string) as xs:string {
@@ -316 +323 @@
 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 := for $coll in $collection return util:eval(fn:concat("collection('", xdb:decode($coll), "')", xdb:decode($cql-query), "/ancestor::CMD")), :)
-        let $results := for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD", "[.//IsPartOf='", xdb:decode($coll) ,"']")),
-    $result-count := fn:count($results),
+        let $results :=
+                if ($collection[1]=$cmd-model:collectionRoot) then
+                                util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD"))
+                        else
+                                for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD", "[.//IsPartOf='", xdb:decode($coll) ,"']"))
+
+    let $result-count := fn:count($results),
     $result-seq := fn:subsequence($results, $start-item, $end-item),
     $seq-count := fn:count($result-seq),