Changeset 743 for MDRepository

Timestamp:

10/04/10 09:16:39 (14 years ago)

Author:

ljo

Message:

First step elem-r() pass collections as nodes.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -39 +39 @@
 
 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)
-};
-
-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] eq $cmd-model:collectionRoot) then
-      util:eval(fn:concat("$collection//", $path))
+      util:eval(fn:concat("$collection/descendant-or-self::", $path))
     else
       for $coll in $collections 
       return
-        util:eval(fn:concat("$collection//ft:query(descendant::IsPartOf, <query><term>", xdb:decode($coll), "</term></query>)//", $path, "/ancestor::CMD"))
-
+        util:eval(fn:concat("$collection/ft:query(descendant::IsPartOf, <query><term>", xdb:decode($coll), "</term></query>)/ancestor-or-self::CMD/descendant-or-self::", $path))
+        return
+          cmd-model:elem-r($path-nodes, $path, $depth, $depth)
+};
+
+declare function cmd-model:elem-r($path-nodes as node()+, $path as xs:string, $max-depth as xs:integer, $depth as xs:integer) as element() {
       let $path-count := count($path-nodes)
-    
       let $subs := distinct-values($path-nodes/child::element()/name())
-      let $text-nodes := $path-nodes//text()
+      let $text-nodes := for $node in $path-nodes[child::element()[not(child::element())]] return $node//text()
       let $text-count := count($text-nodes)
       let $text-count-distinct := count(distinct-values($text-nodes))
@@ -64 +62 @@
             (for $elname in $subs[. != '']
             return
-              cmd-model:elem-r($collections, concat($path, '/', $elname), $max-depth, $depth - 1),
+              cmd-model:elem-r($path-nodes, concat($path, '/', $elname), $max-depth, $depth - 1),
               if ($max-depth eq 1) then cmd-model:values($path-nodes) else ())
           else 'maxdepth'