Changeset 696 for MDRepository

Timestamp:

09/15/10 07:58:46 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm -ongoing refactoring. Might not be working yet.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -36 +36 @@
 
 
-declare function cmd-model:elem($collection as xs:string, $path as xs:string, $depth as xs:integer) as element() {
-cmd-model:elem-r($collection, $path, $depth, $depth)
+declare function cmd-model:elem($collections as xs:string+, $path as xs:string, $depth as xs:integer) as element() {
+(: fixme! - handle multiple collections :)
+cmd-model:elem-r($collections, $path, $depth, $depth)
 };
 
@@ -130 +131 @@
 
 :)
-declare function cmd-model:create-doc($collection as xs:string, $type-name as xs:string, $depth as xs:integer) as xs:string* {
+declare function cmd-model:create-doc($collections as xs:string+, $type-name as xs:string, $depth as xs:integer) as xs:string* {
   (: if newer data available :)
-    cmd-model:store-result($collection, cmd-model:elem($collection, $type-name, $depth), $type-name, $depth)
+    cmd-model:store-result($collections, cmd-model:elem($collections, $type-name, $depth), $type-name, $depth)
   (:else () :)
 };
@@ -139 +140 @@
 
 :)
-declare function cmd-model:get-result-doc($collection as xs:string, $type-name as xs:string, $depth as xs:integer) as item()* {
-  let $name-last := text:groups($type-name, "/(\w+)$")[last()],
-    $new-name := if (fn:empty($name-last)) then $type-name else $name-last,
-    $dummy := if (cmd-model:is-result-available($collection, fn:concat("/", $new-name, xs:string($depth)))) then
+declare function cmd-model:get-result-doc($collections as xs:string+, $type-name as xs:string, $depth as xs:integer) as item()* {
+  let $name := cmd-model:make-compound-doc-name($collections, "values", xs:string($depth)),
+    $dummy := if (cmd-model:is-result-available($cmd-model:commonFreqsPath, $name))) then
     ()
     else
-      cmd-model:create-doc($collection, $type-name, $depth)
-    return
-      fn:doc(fn:concat($collection, "/", $new-name, xs:string($depth), $cmd-model:xmlExt))
+      cmd-model:create-doc($collections, $type-name, $depth)
+    return
+      cmd-model:get-doc($cmd-model:commonFreqsPath, $name)
 };
 
@@ -181 +181 @@
     $dummy := xdb:login($cmd-model:cmdiDatabaseURI, $clarin-writer//write-user/text(), $clarin-writer//write-user-cred/text())
     return
-    
-      if (fn:exists($coll-names[2])) then
-        (: Det gÀller fler Àn en samling. :)
-        xdb:store($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($coll-names, $type-name, $depth), cmd-model:make-doc-element-of-type($type-name, $coll-names, $entries, $depth))
-      else
-        (: Det gÀller endast en samling. :)
-        let $dummy := util:log('debug', fn:concat('Stores ', $type-name, ' in ', $coll-names))
-        return xdb:store($coll-names, cmd-model:make-doc-name($coll-names, $type-name, xs:string($depth), fn:false()), cmd-model:make-doc-element-of-type($type-name, (), $entries, xs:string($depth)))
-};
-
-(:
-  Store the collection listing in give collection.
+        xdb:store($cmd-model:commonFreqsPath, cmd-model:make-compound-doc-name($coll-names, $type-name, xs:string($depth)), cmd-model:make-doc-element-of-type($type-name, $coll-names, $entries, $depth))
+};
+
+(:
+  Store the collection listing for given collection.
 :)
 declare function cmd-model:store-collection-data($data as node(), $collection-path as xs:string, $doc-name as xs:string) as xs:string? {