Changeset 256 for MDService

Timestamp:

03/18/10 18:12:29 (14 years ago)

Author:

ljo

Message:

Refactoring queryModel

Location:

MDService/trunk/xquery

Files:

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

MDService/trunk/xquery/cmd-model.xql

@@ -27 +27 @@
         (:cmd-model:get-collections() :) <error>Unimplemented</error>
       else if ($operation eq $cmd-model:queryModel) then
-      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)
+        cmd-model:query-model($cmd-index-path, $collection, $format, $max-depth)
     else if ($operation eq $cmd-model:searchRetrieve) then
       (: cmd-model:search-retrieve() :) <error>Unimplemented</error>

MDService/trunk/xquery/cmd-model.xqm

@@ -173 +173 @@
   $cmd-model:docTypeTerms
 };
+
+(:~
+  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)
+};