Changeset 258

Timestamp:

03/19/10 14:32:10 (14 years ago)

Author:

ljo

Message:

cmd-model - Rudimentary version of API function getCollections

Location:

MDService/trunk/xquery

Files:

• cmd-model.xql (modified) (1 diff)
• cmd-model.xqm (modified) (3 diffs)

MDService/trunk/xquery/cmd-model.xql

@@ -20 +20 @@
     else
       $cmd-index,
-    $format := request:get-parameter("format", "xml"),
+    $format := request:get-parameter("format", $cmd-model:responseFormatXml),
     $collection := fn:concat("/db/cmdi-mirror/", request:get-parameter("collection", "silang_data")),
     $max-depth as xs:integer := xs:integer(request:get-parameter("maxdepth", 1))
     return
       if ($operation eq $cmd-model:getCollections) then
-        (:cmd-model:get-collections() :) <error>Unimplemented</error>
+        cmd-model:get-collections($collection, $format, $max-depth)
       else if ($operation eq $cmd-model:queryModel) then
         cmd-model:query-model($cmd-index-path, $collection, $format, $max-depth)

MDService/trunk/xquery/cmd-model.xqm

@@ -23 +23 @@
 declare variable $cmd-model:docTypeTerms as xs:string := "Terms";
 declare variable $cmd-model:docTypeSuffix as xs:string := "Values";
+
+declare variable $cmd-model:responseFormatXml as xs:string := "xml";
+declare variable $cmd-model:responseFormatJSon as xs:string := "json";
+declare variable $cmd-model:responseFormatText as xs:string := "text";
 
 declare variable $cmd-model:xmlExt as xs:string := ".xml";
@@ -70 +74 @@
 
 (:
+  Recurse for collections
+:)
+declare function cmd-model:recurse-collections($collection as xs:string, $depth as xs:integer) as item()* {
+    let $children := xdb:get-child-collections($collection)
+    return
+      if (fn:exists($children)) then
+          let $child-results :=
+            for $child in $children
+            return
+              cmd-model:recurse-collections(concat($collection, '/', xs:string($child)), $depth),
+              $current := <Collection>{$collection}</Collection>
+          return ($current, $child-results)
+      else
+      <Collection>{$collection}</Collection>
+};
+
+(:
 
 :)
@@ -174 +195 @@
 };
 
+(:
+  Seraliseringsformat. 
+:)
+declare function cmd-model:serialise-as($item as node(), $format as xs:string) as item()? {
+      if ($format eq $cmd-model:responseFormatJSon) then
+        let $option := util:declare-option("exist:serialize", "method=text media-type=application/json")
+          return
+           (: json:xml-to-json($item) :) $item
+      else (: $cmd-model:responseFormatXml, $cmd-model:responseFormatText:)
+        $item
+};
+
+
 (:~
   API function queryModel. 
 :)
-declare function cmd-model:query-model($cmd-index-path as xs:string, $collection as xs:string+, $format as xs:string, $max-depth as xs:integer) as node() {
-      if ($format eq "json") then
-        let $option := util:declare-option("exist:serialize", "method=text media-type=application/json")
-          return
-           (: json:xml-to-json( :) cmd-model:get-result-doc($collection, $cmd-index-path, $max-depth) (:) :)
-      else
-        cmd-model:get-result-doc($collection, $cmd-index-path, $max-depth)
-};
+declare function cmd-model:query-model($cmd-index-path as xs:string, $collection as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
+        cmd-model:serialise-as(cmd-model:get-result-doc($collection, $cmd-index-path, $max-depth), $format)
+};
+
+(:~
+  API function getCollections. 
+:)
+declare function cmd-model:get-collections($collections as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
+  let $children := for $collection-item in $collections
+                    return 
+                      cmd-model:recurse-collections($collection-item, $max-depth)
+   return
+     cmd-model:serialise-as(<Collections count="{count($children)}" root="{$collections}">{$children}</Collections>, $format) 
+
+};