Changeset 705 for MDRepository

Timestamp:

09/19/10 13:12:21 (14 years ago)

Author:

vronk

Message:

tried to rework collection-context-handling in queryModel and searchRetrieve; seems to work, but needs check..

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -42 +42 @@
 
 declare function cmd-model:elem-r($collection as xs:string, $path as xs:string, $max-depth as xs:integer, $depth as xs:integer) as element() {
-  let $path-nodes := util:eval(fn:concat("collection('", $collection, "')//", $path))
+  (: let $path-nodes := util:eval(fn:concat("collection('", $collection, "')//", $path)) :)
+  let $path-nodes := for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//CMD[.//IsPartOf='", xdb:decode($coll) ,"']"))
   let $path-count := count($path-nodes)
     
@@ -181 +182 @@
     $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, $depth))
+        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)))
 };
 
@@ -314 +315 @@
 :)
 declare function cmd-model:search-retrieve($cql-query as xs:string, $collection as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
-  let $results := for $coll in $collection return util:eval(fn:concat("collection('", xdb:decode($coll), "')", xdb:decode($cql-query), "/ancestor::CMD")),
+  (:  let $results := for $coll in $collection return util:eval(fn:concat("collection('", xdb:decode($coll), "')", xdb:decode($cql-query), "/ancestor::CMD")), :)
+        let $results := for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD", "[.//IsPartOf='", xdb:decode($coll) ,"']")),
     $result-count := fn:count($results),
     $result-seq := fn:subsequence($results, $start-item, $end-item),