Changeset 670 for MDRepository

Timestamp:

09/06/10 10:32:40 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - externalised the frequency generation for getCollections changed last Friday.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -91 +91 @@
               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)}" sub-colls="{count($child-results)}" >{$child-results}</c>
+          <c n="{$parent}" handle="{$handle}" proxy-id="{$proxy-id}" cnt="-1" 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>
@@ -165 +165 @@
 declare function cmd-model:store-collection-data($data as node(), $collection-path as xs:string, $doc-name as xs:string) as xs:string? {
   let $clarin-writer := fn:doc("/db/clarin/writer.xml"),
-  $dummy := xdb:login($cmd-model:cmdiDatabaseURI, $clarin-writer//write-user/text(), $clarin-writer//write-user-cred/text())
+  $dummy := xdb:login($cmd-model:cmdiDatabaseURI, $clarin-writer//write-user/text(), $clarin-writer//write-user-cred/text()),
+  $store := (: util:catch("org.exist.xquery.XPathException", :) xdb:store($collection-path, $doc-name, $data),(: , ()) :)
+  $stored-doc := doc(concat($collection-path, "/", $doc-name)),
+  $coll-count := update value $stored-doc/Collections/@count with sum($stored-doc//c[not(c)]/@cnt)
   return 
-      (: util:catch("org.exist.xquery.XPathException", :) xdb:store($collection-path, $doc-name, $data)(: , ()) :)
+  for $i in $stored-doc//c[c] 
+  return update value $i/@cnt with sum($i//c[not(c)]/@cnt)
+
 };
 
@@ -273 +278 @@
           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/@cnt)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])
+            cmd-model:store-collection-data(<Collections count="-1" sub-colls="{count($children)}" root="{$collections}">{$children}</Collections>, $names[1], $names[2])
 return 
   cmd-model:serialise-as(cmd-model:get-doc($names[1], $names[2]), $format)