Changeset 746 for MDRepository

Timestamp:

10/04/10 16:33:08 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - some small adjustments on queryModel.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -47 +47 @@
       return
         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 := 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))
-      return 
+    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),
+        $child-elements := $path-nodes/child::element(),
+        $subs := distinct-values($child-elements/name()),
+        $nodes-child-terminal := if (empty($child-elements)) then $path-nodes else $child-elements[not(element())],
+        $text-nodes := $nodes-child-terminal/text(),
+        $text-count := count($text-nodes),
+        $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