Changeset 174 for MDService

Timestamp:

02/03/10 23:33:28 (14 years ago)

Author:

ljo

Message:

queryModel() now taking parameters q (eg MDGroup.Actors.Actor), maxdepth (n default 1), path (material name path eg silang_data or olac/OLAC/The_LINGUIST_List_Language_Resources) and format (only default xml)

Location:

MDService/trunk/xquery

Files:

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

MDService/trunk/xquery/cmd-model.xql

@@ -4 +4 @@
  $Id$
 :)
+import module namespace request="http://exist-db.org/xquery/request";
 
 import module namespace cmd-model = "http://spraakbanken.gu.se/clarin/xquery/model"
@@ -9 +10 @@
 
 (: cmd-model:recurse-collections-model("/db/cmdi-mirror/olac/OLAC/The_LINGUIST_List_Language_Resources", "//MDGroup/Actors/Actor", 4) :)
-cmd-model:get-result-doc("/db/cmdi-mirror/silang_data", "Actor", 4)
+
+declare function local:cmd-model() as item()* {
+  let $action :=  request:get-parameter("operation", ""),
+    $cmd-index := request:get-parameter("q", "MDGroup/Actors/Actor"),
+    $cmd-index-path := 
+    if (fn:contains($cmd-index, ".")) then
+      fn:translate($cmd-index, ".", "/") 
+    else
+      $cmd-index,
+    $format := request:get-parameter("format", "xml"),
+    $path := fn:concat("/db/cmdi-mirror/", request:get-parameter("path", "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)
+};
+
+local:cmd-model()

MDService/trunk/xquery/cmd-model.xqm

@@ -11 +11 @@
 declare variable $cmd-model:cmdiMirrorPath as xs:string {"/db/cmdi-mirror"};
 
-declare variable $cmd-model:typeActorPath as xs:string {"//MDGroup/Actors/Actor"};
+declare variable $cmd-model:typeActorPath as xs:string {"MDGroup/Actors/Actor"};
+declare variable $cmd-model:typeActorPath0 as xs:string {"Actor"};
 
 declare variable $cmd-model:typeActorPathElementPrefix as xs:string {"actor"};
@@ -20 +21 @@
 
 declare function cmd-model:elem($collection as xs:string, $path as xs:string, $depth as xs:integer) as element() {
-  let $path-nodes := util:eval(fn:concat("collection('", $collection, "')", $path))
+  let $path-nodes := util:eval(fn:concat("collection('", $collection, "')//", $path))
   let $path-count := count($path-nodes)
     
@@ -28 +29 @@
   let $text-count-distinct := count(distinct-values($text-nodes))
   return 
-        <elem path="{$path}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}" >
+        <elem 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[. != '']
@@ -82 +83 @@
       cmd-model:create-doc($collection, $type-name, $depth)
     return
-      fn:doc(fn:concat($collection, "/", $type-name, xs:string($depth), $cmd-model:xmlExt))
+      fn:doc(fn:concat($collection, "/", $new-name, xs:string($depth), $cmd-model:xmlExt))
 };
 
@@ -163 +164 @@
   if ($type-name eq $cmd-model:typeActorPath) then
     fn:concat($cmd-model:typeActorPathElementPrefix, $cmd-model:docTypeSuffix)
+  else if ($type-name eq $cmd-model:typeActorPath0) then
+    fn:concat($cmd-model:typeActorPathElementPrefix, $cmd-model:docTypeSuffix)
   else 
     ()