Changeset 247

Timestamp:

03/17/10 21:22:19 (14 years ago)

Author:

ljo

Message:

cmd-model-xql - Some tidying up before changing.

File:

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

MDService/trunk/xquery/cmd-model.xql

@@ -5 +5 @@
 :)
 import module namespace request="http://exist-db.org/xquery/request";
+(: import module namespace json="http://www.json.org"; :)
 
 import module namespace cmd-model = "http://spraakbanken.gu.se/clarin/xquery/model"
@@ -20 +21 @@
       $cmd-index,
     $format := request:get-parameter("format", "xml"),
-    $path := fn:concat("/db/cmdi-mirror/", request:get-parameter("path", "silang_data")),
+    $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
-    cmd-model:get-result-doc($path, $cmd-index-path, $max-depth)
+      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)
 };