Changeset 626 for MDRepository

Timestamp:

08/16/10 16:20:54 (14 years ago)

Author:

ljo

Message:

Some improvments for getCollections.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -78 +78 @@
   Recurse for collections
 :)
-declare function cmd-model:recurse-collections($collection as node()+, $parent as xs:string, $depth as xs:integer) as item()* {
+declare function cmd-model:recurse-collections($collection as node()+, $parent as xs:string, $handle as xs:string, $proxy-id as xs:string, $depth as xs:integer) as item()* {
     let $children := if ($depth eq 0) then () else $collection//ResourceProxy[ResourceType = "Metadata"]
     return
@@ -85 +85 @@
             for $child in $children
               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)
+                $child-name := ($child-doc//Corpus/Name, $child-doc//Session/Name, "UNKNOWN")[1]
+            return if (empty($child-doc)) then <no-target proxy-id="{$child/@id}">{<proxy>{$child}</proxy>, <in-document>{concat(util:collection-name($child/root()), "/", util:document-name($child/root()))}</in-document>}</no-target> else
+              cmd-model:recurse-collections($child-doc, $child-name, $child-doc//Header/MdSelfLink, $child/@id, $depth - 1)
           return
-          <c n="{$parent}" cnt="{sum($child-results/@cnt)}">{$child-results}</c>
+          <c n="{$parent}" handle="{$handle}" proxy-id="{$proxy-id}" cnt="{sum($child-results/*:c/@cnt)}">{$child-results}</c>
       else
-      <c n="{$parent}" cnt="{count(collection(concat(util:collection-name($collection/CMD[1]/root()), "/../"))//CMD)}"></c>
+      <c n="{$parent}" handle="{$handle}" proxy-id="{$proxy-id}" cnt="{count(collection(concat(util:collection-name($collection/CMD[1]/root()), "/../"))//CMD[not(//ResourceType[. = "Metadata"])])}"></c>
 };
 
@@ -260 +260 @@
       else
         let $children := for $collection-item in $collections
-          let $collection-item-doc := collection(concat($collection-item, "/", "Corpusstructure"))
+          let $collection-item-docs := collection(concat($collection-item, "/", "Corpusstructure"))
         return
-          cmd-model:recurse-collections($collection-item-doc, "", $max-depth)
+          for $collection-doc in $collection-item-docs//CMD return
+          cmd-model:recurse-collections($collection-doc, ($collection-doc//Corpus/Name, $collection-doc//Session/Name, "UNKNOWN")[1], $collection-doc//MdSelfLink, "", $max-depth)
           return
-            cmd-model:store-collection-data(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])
+            cmd-model:store-collection-data(<Collections count="{count($children/@cnt)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])
 return 
   cmd-model:serialise-as(cmd-model:get-doc($names[1], $names[2]), $format)