Changeset 254 for MDService

Timestamp:

03/18/10 17:20:35 (14 years ago)

Author:

ljo

Message:

Preparing for other operations than queryModel: getCollections and searchRetrieve

Location:

MDService/trunk/xquery

Files:

• cmd-model.xql (modified) (2 diffs)
• cmd-model.xqm (modified) (2 diffs)

MDService/trunk/xquery/cmd-model.xql

@@ -13 +13 @@
 
 declare function local:cmd-model() as item()* {
-  let $action :=  request:get-parameter("operation", ""),
+  let $operation :=  request:get-parameter("operation", $cmd-model:queryModel),
     $cmd-index := request:get-parameter("q", "MDGroup/Actors/Actor"),
     $cmd-index-path := 
@@ -23 +23 @@
     $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() :)
+      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)
+      else
+        cmd-model:get-result-doc($collection, $cmd-index-path, $max-depth)
+    else if ($operation eq $cmd-model:searchRetrieve) then
+      (: cmd-model:search-retrieve() :)
+    else 
+      <error>Unknown operation</error>
+
 };
 

MDService/trunk/xquery/cmd-model.xqm

@@ -12 +12 @@
 declare variable $cmd-model:commonFreqsPath as xs:string := "/db/common/clarin/freqs";
 declare variable $cmd-model:cmdiMirrorPath as xs:string := "/db/cmdi-mirror";
+
+declare variable $cmd-model:getCollections as xs:string := "getCollections";
+declare variable $cmd-model:queryModel as xs:string := "queryModel";
+declare variable $cmd-model:searchRetrieve as xs:string := "searchRetrieve";
 
 declare variable $cmd-model:typeActorPath as xs:string := "MDGroup/Actors/Actor";
@@ -31 +35 @@
   let $text-count-distinct := count(distinct-values($text-nodes))
   return 
-        <Term path="{fn:concat("//", $path)}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">
-        { if ($depth > 0) then
+        <Term path="{fn:concat("//", $path)}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{
+          if ($depth > 0) then
             for $elname in $subs[. != '']
             return