Changeset 714 for MDRepository

Timestamp:

09/24/10 09:02:12 (14 years ago)

Author:

ljo

Message:

cmd-model. xqm - fixed wrong names for value cache docs.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -46 +46 @@
   let $collection := collection($cmd-model:cmdiMirrorPath),
     $path-nodes :=
-    if ($collections[1] = $cmd-model:collectionRoot) then
+    if ($collections[1] eq $cmd-model:collectionRoot) then
       util:eval(fn:concat("$collection//", $path))
     else
-      for $coll in $collections return util:eval(fn:concat("$collection//CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']//", $path))
+      for $coll in $collections return util:eval(fn:concat("$collection//ft:query(descendant::IsPartOf, <query><term>", xdb:decode($coll) ,"</term></query>)//", $path, "/ancestor::CMD"))
 
   let $path-count := count($path-nodes)
@@ -70 +70 @@
 declare function cmd-model:values($nodes as node()*) as node()* {
 let $keys := distinct-values($nodes/text())
-for $key at $pos in $keys[if ($cmd-model:valuesLimit eq 0) then () else (1 to $cmd-model:valuesLimit)]
+let $values := for $key at $pos in $keys
   let $kcount := count($nodes[. eq $key])
     order by lower-case($key) ascending
     return <v key="{$key}" cnt="{$kcount}" />
+return
+  if ($cmd-model:valuesLimit eq 0) then $values 
+  else
+  subsequence($values, 1, $cmd-model:valuesLimit)
 };
 
@@ -170 +174 @@
 :)
 declare function cmd-model:is-result-available($collection as xs:string, $result-ref as xs:string) as xs:boolean {
-  fn:doc-available(fn:concat($collection, $result-ref, $cmd-model:xmlExt))
+  fn:doc-available(fn:concat($collection, "/", $result-ref))
 };
 
@@ -189 +193 @@
     $dummy := xdb:login($cmd-model:cmdiDatabaseURI, $clarin-writer//write-user/text(), $clarin-writer//write-user-cred/text())
     return
-        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, xs:string($depth)))
+        xdb:store($cmd-model:commonFreqsPath, $type-name, cmd-model:make-doc-element-of-type($type-name, $coll-names, $entries, xs:string($depth)))
 };
 
@@ -295 +299 @@
   API function queryModel. 
 :)
-declare function cmd-model:query-model($cmd-index-path as xs:string, $collection as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
+declare function cmd-model:query-model($cmd-index-path as xs:string, $collection as xs:string+, $format as xs:string, $max-depth as xs:integer) as item()? {
         cmd-model:serialise-as(cmd-model:get-result-doc($collection, $cmd-index-path, $max-depth), $format)
 };
@@ -325 +329 @@
   let $collection := collection($cmd-model:cmdiMirrorPath),
     $results :=
-    if ($collections[1] = $cmd-model:collectionRoot) then
+    if ($collections[1] eq $cmd-model:collectionRoot) then
       util:eval(fn:concat("$collection", xdb:decode($cql-query), "/ancestor::CMD"))
     else