Changeset 725 for MDRepository

Timestamp:

09/28/10 10:45:51 (14 years ago)

Author:

vronk

Message:

corrected root-handling in get-collection

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -277 +277 @@
     (: let $key := xdb:decode(($doc-name, $id)[1])
     return ft:query(//MdSelfLink, <term>{$key}</term>)[matches(., concat("^", $key, "$"))]/ancestor::CMD :)
-  else if (empty($doc-name)) then
-    collection($id)//IsPartOf[. = "root"]/ancestor::CMD
+  else if (empty($doc-name) or $id=$cmd-model:collectionRoot ) then
+    collection($cmd-model:cmdiMirrorPath)//IsPartOf[. = $cmd-model:collectionRoot]/ancestor::CMD
   else
     doc(concat($id, "/", $doc-name))
@@ -307 +307 @@
 :)
 declare function cmd-model:get-collections($collections as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
-  let $names := ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", $max-depth)),
+  let $names := ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", xs:string($max-depth))),
  $dummy := 
       if (cmd-model:is-doc-available($names[1], $names[2])) then