Changeset 246

Timestamp:

03/17/10 21:19:03 (14 years ago)

Author:

ljo

Message:

cmd-model-xqm - Some tidying up before changing.

File:

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

MDService/trunk/xquery/cmd-model.xqm

@@ -8 +8 @@
 import module namespace util="http://exist-db.org/xquery/util";
 
-declare variable $cmd-model:commonFreqsPath as xs:string {"/db/common/clarin/freqs"};
-declare variable $cmd-model:cmdiMirrorPath as xs:string {"/db/cmdi-mirror"};
+declare variable $cmd-model:cmdiDatabaseURI as xs:string := "xmldb:exist:///db";
 
-declare variable $cmd-model:typeActorPath as xs:string {"MDGroup/Actors/Actor"};
-declare variable $cmd-model:typeActorPath0 as xs:string {"Actor"};
+declare variable $cmd-model:commonFreqsPath as xs:string := "/db/common/clarin/freqs";
+declare variable $cmd-model:cmdiMirrorPath as xs:string := "/db/cmdi-mirror";
 
-declare variable $cmd-model:typeActorPathElementPrefix as xs:string {"actor"};
-declare variable $cmd-model:typeSuffix as xs:string {"Value"};
-declare variable $cmd-model:docTypeSuffix as xs:string {"Values"};
+declare variable $cmd-model:typeActorPath as xs:string := "MDGroup/Actors/Actor";
+declare variable $cmd-model:typeActorPath0 as xs:string := "Actor";
+declare variable $cmd-model:typeActorRolePath as xs:string := "MDGroup/Actors/Actor/Role";
 
-declare variable $cmd-model:xmlExt as xs:string {".xml"};
+declare variable $cmd-model:docTypeModelTrees as xs:string := "ModelTrees";
+declare variable $cmd-model:docTypeTerms as xs:string := "Terms";
+declare variable $cmd-model:docTypeSuffix as xs:string := "Values";
+
+declare variable $cmd-model:xmlExt as xs:string := ".xml";
 
 declare function cmd-model:elem($collection as xs:string, $path as xs:string, $depth as xs:integer) as element() {
@@ -99 +102 @@
 :)
 declare function cmd-model:store-result($coll-names as xs:string+, $entries as element()*, $type-name as xs:string, $depth as xs:integer) as xs:string {
-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)))
+  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())
+    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)))
 };
 
@@ -158 +165 @@
 
 (:
-  Skapa elementnamn för dokumentet av typ. Finns den inte så felar returen, så 
-  att inget hÀnder obemÀrkt.
+  Skapa elementnamn för dokumentet av typ. 
 :)
 declare function cmd-model:get-doc-type-element-name($type-name as xs:string) as xs:string {
-  if ($type-name eq $cmd-model:typeActorPath) then
-    fn:concat($cmd-model:typeActorPathElementPrefix, $cmd-model:docTypeSuffix)
-  else if ($type-name eq $cmd-model:typeActorPath0) then
-    fn:concat($cmd-model:typeActorPathElementPrefix, $cmd-model:docTypeSuffix)
-  else 
-    ()
+  let $name-last := text:groups($type-name, "/(\w+)$")[last()],
+    return
+    if (fn:empty($name-last)) then $cmd-model:ModelTrees else $cmd-model:Terms
+
 };