Changeset 710 for MDRepository

Timestamp:

09/20/10 15:44:56 (14 years ago)

Author:

ljo

Message:

cmd-model - some initial cleanup before new refactoring.

File:

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

MDRepository/trunk/xquery/cmd-model.xql

@@ -21 +21 @@
       $cmd-index,
     $format := request:get-parameter("format", $cmd-model:responseFormatXml),
-    $collection := "/db/cmdi-mirror",
     $collection-params := request:get-parameter("collection", $cmd-model:collectionRoot),
-    $query-model-collection := 
-    if (fn:empty($collection-params)) then fn:concat($collection, "/")
-    else
-      for $coll in $collection-params 
-      return 
-        if (starts-with($coll, "test-") or starts-with($coll, "clarin-")) then
-          $coll
-        else
-          fn:concat($collection, "/", $coll),
     $query-collections := 
     if (matches($collection-params, "^root$") or $collection-params eq "") then 
@@ -42 +32 @@
         cmd-model:get-collections($query-collections, $format, $max-depth)
       else if ($operation eq $cmd-model:queryModel) then
-        cmd-model:query-model($cmd-index-path, $query-model-collection, $format, $max-depth)
+        cmd-model:query-model($cmd-index-path, $query-collections, $format, $max-depth)
     else if ($operation eq $cmd-model:searchRetrieve) then
       let $cql-query := request:get-parameter("query", "MDGroup/Actors/Actor"),