Changeset 711 for MDRepository

Timestamp:

09/20/10 16:04:17 (14 years ago)

Author:

ljo

Message:

cmd-model - some initial cleanup before new refactoring.

Location:

MDRepository/trunk/xquery

Files:

• cmd-model.xql (modified) (1 diff)
• cmd-model.xqm (modified) (2 diffs)

MDRepository/trunk/xquery/cmd-model.xql

@@ -10 +10 @@
 at "xmldb:exist:///db/clarin/cmd-model.xqm";
 
-(: path="olac/OLAC/The_LINGUIST_List_Language_Resources", q="MDGroup.Actors.Actor", maxdepth=4 :)
 
 declare function local:cmd-model() as item()* {

MDRepository/trunk/xquery/cmd-model.xqm

@@ -43 +43 @@
 };
 
-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 :=
-                if ($collection[1]=$cmd-model:collectionRoot) then
-                                util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//", $path))
-                        else
-                                for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')//CMD[.//IsPartOf='", xdb:decode($coll) ,"']//", $path))
+declare function cmd-model:elem-r($collections as xs:string+, $path as xs:string, $max-depth as xs:integer, $depth as xs:integer) as element() {
+  let $collection := collection($cmd-model:cmdiMirrorPath),
+    $path-nodes :=
+    if ($collections[1] = $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))
 
   let $path-count := count($path-nodes)
@@ -322 +322 @@
   API function searchRetrieve. 
 :)
-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 :=
-    if ($collection[1] = $cmd-model:collectionRoot) then
-      util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD"))
+declare function cmd-model:search-retrieve($cql-query as xs:string, $collections as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
+  let $collection := collection($cmd-model:cmdiMirrorPath),
+    $results :=
+    if ($collections[1] = $cmd-model:collectionRoot) then
+      util:eval(fn:concat("$collection", xdb:decode($cql-query), "/ancestor::CMD"))
     else
-      for $coll in $collection return util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", xdb:decode($cql-query), "/ancestor::CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']"))
+      for $coll in $collections return util:eval(fn:concat("$collection", xdb:decode($cql-query), "/ancestor::CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']"))
 
     let $result-count := fn:count($results),