Changeset 618 for MDRepository

Timestamp:

08/11/10 14:45:50 (14 years ago)

Author:

ljo

Message:

First take on new getCollections

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -78 +78 @@
   Recurse for collections
 :)
-declare function cmd-model:recurse-collections($collection as xs:string, $depth as xs:integer) as item()* {
-    let $children := xdb:get-child-collections($collection)
+declare function cmd-model:recurse-collections($collection as node()+, $parent as xs:string, $depth as xs:integer) as item()* {
+    let $children := if ($depth eq 0) then () else $collection//ResourceProxy[ResourceType = "Metadata"]
     return
       if (fn:exists($children)) then
           let $child-results :=
             for $child in $children
-            return
-              cmd-model:recurse-collections(concat($collection, '/', xs:string($child)), $depth),
-              $current := <Collection name="{text:groups($collection, "/([^/]+)$")[last()]}">{$collection}</Collection>
-          return ($current, $child-results)
+              let $child-doc := doc(concat(util:collection-name($child/root()), "/", $child/ResourceRef)),
+                $child-name := ($child-doc//Corpus/Name, "UNKNOWN")[1]
+            return if (empty($child-doc)) then <no-target>{util:collection-name($child/root())}</no-target> else
+              cmd-model:recurse-collections($child-doc, $child-name, $depth - 1)
+          return
+          <c n="{$parent}" cnt="{sum($child-results/@cnt)}">{$child-results}</c>
       else
-      <Collection>{$collection}</Collection>
+      <c n="{$parent}" cnt="{count($collection//CMD)}"></c>
 };
 
@@ -258 +260 @@
       else
         let $children := for $collection-item in $collections
-        return 
-          cmd-model:recurse-collections($collection-item, $max-depth)
+          let $collection-item-doc := collection(concat($collection-item, "/", "Corpusstructure"))
+        return
+          cmd-model:recurse-collections($collection-item-doc, "", $max-depth)
           return
             cmd-model:store-collection-data(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])