Changeset 732 for MDRepository

Timestamp:

09/29/10 13:56:25 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - Correct collections passing in elem-r().

File:

• MDRepository/trunk/xquery/cmd-model.xqm (modified) (1 diff)

MDRepository/trunk/xquery/cmd-model.xqm

@@ -49 +49 @@
       util:eval(fn:concat("$collection//", $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"))
-
-  let $path-count := count($path-nodes)
+      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)
     
-  let $subs := distinct-values($path-nodes/child::element()/name())
-  let $text-nodes := $path-nodes//text()
-  let $text-count := count($text-nodes)
-  let $text-count-distinct := count(distinct-values($text-nodes))
-  return 
+      let $subs := distinct-values($path-nodes/child::element()/name())
+      let $text-nodes := $path-nodes//text()
+      let $text-count := count($text-nodes)
+      let $text-count-distinct := count(distinct-values($text-nodes))
+      return 
         <Term path="{fn:concat("//", $path)}" name="{text:groups($path, "/([^/]+)$")[last()]}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{
           if ($depth > 0) then
             (for $elname in $subs[. != '']
             return
-              cmd-model:elem-r($collection, concat($path, '/', $elname), $max-depth, $depth - 1),
+              cmd-model:elem-r($collections, concat($path, '/', $elname), $max-depth, $depth - 1),
               if ($max-depth eq 1) then cmd-model:values($path-nodes) else ())
           else 'maxdepth'