Changeset 657 for MDRepository

Timestamp:

08/26/10 13:39:21 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - added count of sub collections. All calculated collection docs go into the same collection.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -86 +86 @@
               let $child-doc := if (empty($child/unresolvable-uri)) then doc(concat(util:collection-name($child/root()), "/", $child/ResourceRef)) else (),
                 $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
+            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}" handle="{$handle}" proxy-id="{$proxy-id}" cnt="{sum($child-results/*:c/@cnt)}">{$child-results}</c>
+          <c n="{$parent}" handle="{$handle}" proxy-id="{$proxy-id}" cnt="{sum($child-results/*:c/@cnt)}" sub-colls="{count($child-results)}" >{$child-results}</c>
       else
       <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>
@@ -228 +230 @@
   Get the resource by handle or by path. 
 :)
-declare function cmd-model:get-resource-by-handle-or-collection-path($id as xs:string) as node()? {
+declare function cmd-model:get-resource-by-handle-or-collection-path($id as xs:string) as node()* {
   (: fixme! - urldecode $id when we decide to pass them encoded from the client.  :)
   if (starts-with($id, "test-")) then
-    collection($cmd-model:cmdiMirrorPath)//MdSelfLink[. = $id]/ancestor::CMD
+    collection($cmd-model:cmdiMirrorPath)//MdSelfLink[. = xdb:decode($id)]/ancestor::CMD
   else
     collection($id)//IsPartOf[. = "root"]/ancestor::CMD
@@ -260 +262 @@
 :)
 declare function cmd-model:get-collections($collections as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
-  let $names := if (exists($collections[2])) then
-    ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", $max-depth)) 
-  else if (starts-with($collections, "test-")) then 
-    ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", $max-depth)) 
-  else
-    ($collections, concat($cmd-model:collectionDocName, xs:string($max-depth))),
- $dummy :=   
+  let $names := ($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($collections, "collection", $max-depth)),
+ $dummy := 
       if (cmd-model:is-doc-available($names[1], $names[2])) then
         ()