Changeset 571 for MDRepository

Timestamp:

07/05/10 15:35:56 (14 years ago)

Author:

ljo

Message:

cmd-model.xql - handle several collections consistently for get-collection and search-retrieve.

File:

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

MDRepository/trunk/xquery/cmd-model.xql

@@ -23 +23 @@
     $collection := "/db/cmdi-mirror",
     $query-model-collection := fn:concat($collection, "/", if (fn:empty(request:get-parameter("collection", ()))) then "silang_data" else ""),
-    $query-collection := fn:concat($collection, if (fn:empty(request:get-parameter("collection", ()))) then "" else fn:concat("/", request:get-parameter("collection", ()))),
+    $query-collections := 
+    if (fn:empty(request:get-parameter("collection", ()))) then
+      $collection
+    else
+      for $coll in request:get-parameter("collection", ()) 
+      return fn:concat($collection, "/", $coll),
     $max-depth as xs:integer := xs:integer(request:get-parameter("maxdepth", 1))
     return
       if ($operation eq $cmd-model:getCollections) then
-        cmd-model:get-collections($query-collection, $format, $max-depth)
+        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)
@@ -35 +40 @@
         $end-item := request:get-parameter("iend", 50)
         
-      return cmd-model:search-retrieve($cql-query, $query-collection, $format, $start-item, $end-item)
+      return cmd-model:search-retrieve($cql-query, $query-collections, $format, $start-item, $end-item)
     else 
       <error>Unknown operation</error>