Changeset 251 for MDService

Timestamp:

03/18/10 15:58:32 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - ModelTrees? -> Terms and elem -> Term.

File:

• MDService/trunk/xquery/cmd-model.xqm (modified) (4 diffs)

MDService/trunk/xquery/cmd-model.xqm

@@ -17 +17 @@
 declare variable $cmd-model:typeActorRolePath as xs:string := "MDGroup/Actors/Actor/Role";
 
-declare variable $cmd-model:docTypeModelTrees as xs:string := "ModelTrees";
 declare variable $cmd-model:docTypeTerms as xs:string := "Terms";
 declare variable $cmd-model:docTypeSuffix as xs:string := "Values";
@@ -32 +31 @@
   let $text-count-distinct := count(distinct-values($text-nodes))
   return 
-        <elem path="{fn:concat("//", $path)}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}" >
+        <Term path="{fn:concat("//", $path)}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">
         { if ($depth > 0) then
             for $elname in $subs[. != '']
@@ -38 +37 @@
               cmd-model:elem($collection, concat($path, '/', $elname), $depth - 1)
           else 'maxdepth'
-        }</elem>
+        }</Term>
 };
 
 declare function cmd-model:paths($n) {
         for $el in $n
-        return <elem name="{$el/name()}"> {
+        return <Term name="{$el/name()}"> {
         for $anc in $el/parent::element()
         return util:node-xpath($anc)
-        }</elem>
+        }</Term>
 };
 
@@ -168 +167 @@
 :)
 declare function cmd-model:get-doc-type-element-name($type-name as xs:string) as xs:string {
-  let $name-last := text:groups($type-name, "/(\w+)$")[last()]
-    return
-    if (fn:empty($name-last)) then $cmd-model:ModelTrees else $cmd-model:Terms
-
+  $cmd-model:docTypeTerms
 };