Changeset 709 for MDRepository

Timestamp:

09/20/10 15:24:19 (14 years ago)

Author:

ljo

Message:

cmd-model - some initial cleanup before new refactoring.

Location:

MDRepository/trunk/xquery

Files:

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

MDRepository/trunk/xquery/cmd-model.xql

@@ -22 +22 @@
     $format := request:get-parameter("format", $cmd-model:responseFormatXml),
     $collection := "/db/cmdi-mirror",
-    $collection-params := request:get-parameter("collection", ()),
+    $collection-params := request:get-parameter("collection", $cmd-model:collectionRoot),
     $query-model-collection := 
     if (fn:empty($collection-params)) then fn:concat($collection, "/")
@@ -33 +33 @@
           fn:concat($collection, "/", $coll),
     $query-collections := 
-    if (fn:empty($collection-params) or $collection-params='') then
+    if (matches($collection-params, "^root$") or $collection-params eq "") then 
       $cmd-model:collectionRoot
     else

MDRepository/trunk/xquery/cmd-model.xqm

@@ -87 +87 @@
 
 :)
-declare function cmd-model:recurse-collections-model($collection as xs:string, $type-name as xs:string, $depth as xs:integer) as item()* {
+declare function cmd-model:recurse-collections-model($collection as xs:string, $type-name as xs:string, $depth as xs:integer, $name as xs:string) as item()* {
     let $children := xdb:get-child-collections($collection)
     return
@@ -94 +94 @@
             for $child in $children
             return
-              cmd-model:recurse-collections-model(fn:concat($collection, '/', xs:string($child)), $type-name, $depth),
-              $current := cmd-model:create-doc($collection, $type-name, $depth)
+              cmd-model:recurse-collections-model(fn:concat($collection, '/', xs:string($child)), $type-name, $depth, $name),
+              $current := cmd-model:create-doc($collection, $type-name, $depth, $name)
           return ($current, $child-results)
       else
-        cmd-model:create-doc($collection, $type-name, $depth)
+        cmd-model:create-doc($collection, $type-name, $depth, $name)
 };
 
@@ -139 +139 @@
 
 :)
-declare function cmd-model:create-doc($collections as xs:string+, $type-name as xs:string, $depth as xs:integer) as xs:string* {
+declare function cmd-model:create-doc($collections as xs:string+, $type-name as xs:string, $depth as xs:integer, $name as xs:string) as xs:string* {
   (: if newer data available :)
-    cmd-model:store-result($collections, cmd-model:elem($collections, $type-name, $depth), $type-name, $depth)
+    cmd-model:store-result($collections, cmd-model:elem($collections, $type-name, $depth), $name, $depth)
   (:else () :)
 };
@@ -153 +153 @@
     ()
     else
-      cmd-model:create-doc($collections, $type-name, $depth)
+      cmd-model:create-doc($collections, $type-name, $depth, $name)
     return
       cmd-model:get-doc($cmd-model:commonFreqsPath, $name)
@@ -223 +223 @@
 :)
 declare function cmd-model:make-compound-doc-name($coll-names as xs:string+, $type-name as xs:string, $depth as xs:string) as xs:string {
-  let $name-prefix := fn:concat($type-name, $depth)
-    return
-    fn:concat($name-prefix, "-", util:hash(string-join($coll-names, ""), "MD5"), $cmd-model:xmlExt)
+  let $name-prefix := fn:concat($type-name, $depth),
+    $sorted-names := for $coll in $coll-names order by $coll ascending return $coll
+    return
+    fn:concat($name-prefix, "-", util:hash(string-join($sorted-names, ""), "MD5"), $cmd-model:xmlExt)
 };
 
@@ -322 +323 @@
 :)
 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 := for $coll in $collection return util:eval(fn:concat("collection('", xdb:decode($coll), "')", xdb:decode($cql-query), "/ancestor::CMD")), :)
-        let $results :=
-                if ($collection[1]=$cmd-model:collectionRoot) then
-                                util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", 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", "[.//IsPartOf='", xdb:decode($coll) ,"']"))
+  let $results :=
+    if ($collection[1] = $cmd-model:collectionRoot) then
+      util:eval(fn:concat("collection('", $cmd-model:cmdiMirrorPath, "')", 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) ,"']"))
 
     let $result-count := fn:count($results),