Changeset 826 for MDRepository

Timestamp:

11/01/10 13:24:46 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - first merge.

File:

• MDRepository/trunk/xquery/cmd-model.xqm (modified) (12 diffs)

MDRepository/trunk/xquery/cmd-model.xqm

@@ -42 +42 @@
 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()? {
         
-        let $name := cmd-model:gen-cache-id("model", ($collection, $cmd-index-path), xs:string($max-depth)),
-        $doc := 
+  let $name := cmd-model:gen-cache-id("model", ($collection, $cmd-index-path), xs:string($max-depth)),
+    $doc := 
     if (cmd-model:is-in-cache($name)) then
       cmd-model:get-from-cache($name)
     else
-        let $data := cmd-model:elem($collection, $cmd-index-path, $max-depth)
-                return cmd-model:store-in-cache($name, $data)
-
-        return 
-        cmd-model:serialise-as($doc, $format)   
+      let $data := cmd-model:elem($collection, $cmd-index-path, $max-depth)
+        return cmd-model:store-in-cache($name, $data)
+  return 
+    cmd-model:serialise-as($doc, $format)       
 };
 
@@ -59 +58 @@
 declare function cmd-model:get-collections($collections as xs:string+, $format as xs:string, $max-depth as xs:integer) as item() {
   let $name := cmd-model:gen-cache-id("collection", $collections, xs:string($max-depth)),
-        $doc := 
+    $doc := 
     if (cmd-model:is-in-cache($name)) then
        cmd-model:get-from-cache($name)
     else
-                let $data := cmd-model:colls($collections, $max-depth)
-                return cmd-model:store-in-cache($name, $data)
-        return 
-        cmd-model:serialise-as($doc, $format)
+      let $data := cmd-model:colls($collections, $max-depth)
+        return cmd-model:store-in-cache($name, $data)
+  return 
+    cmd-model:serialise-as($doc, $format)
 };
 
@@ -74 +73 @@
 declare function cmd-model:search-retrieve($cql-query as xs:string, $collections as xs:string+, $format as xs:string, $start-item as xs:integer, $end-item as xs:integer) as item()* {
   let $collection := collection($cmd-model:cmdiMirrorPath),
+    $decoded-query := xdb:decode($cql-query),
+    $sanitized-query := cmd-model:sanitize-query($decoded-query),
     $results :=
     if ($collections[1] eq $cmd-model:collectionRoot) then
-      util:eval(fn:concat("$collection", xdb:decode($cql-query), "/ancestor::CMD"))
+      util:eval(fn:concat("$collection", $sanitized-query, "/ancestor-or-self::CMD"))
     else
-      for $coll in $collections return util:eval(fn:concat("$collection", xdb:decode($cql-query), "/ancestor::CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']"))
+      for $coll in $collections return util:eval(fn:concat("$collection", $sanitized-query, "/ancestor-or-self::CMD[descendant::IsPartOf = '", xdb:decode($coll) ,"']"))
 
     let $result-count := fn:count($results),
@@ -86 +87 @@
     <searchRetrieveResponse>
       <numberOfRecords>{$result-count}</numberOfRecords>
-      <echoedSearchRetrieveRequest>{$cql-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
+      <echoedSearchRetrieveRequest>{if ($decoded-query ne $sanitized-query) then "Rewritten to descendant-or-self::CMD" else $cql-query, $collections, $start-item, $end-item}</echoedSearchRetrieveRequest>
       <diagnostics>{$seq-count}</diagnostics>
       <records>
@@ -98 +99 @@
 };
 
-(: **********************
-        queryModel - subfunctions
-C:)
+(: 
+  **********************
+  queryModel - subfunctions
+:)
+
+declare function cmd-model:sanitize-query($query as xs:string) as xs:string {
+if ($query = ("//*", "descendant::element()")) then "/descendant-or-self::CMD" else $query
+};
 
 declare function cmd-model:elem($collections as xs:string+, $path as xs:string, $depth as xs:integer) as element() {
@@ -156 +162 @@
 
 
-(: **********************
-        getCollections - subfunctions   :)
+(: 
+  **********************
+  getCollections - subfunctions
+:)
 
 declare function cmd-model:colls($collections as xs:string+, $max-depth as xs:integer) as element() {
@@ -208 +216 @@
 };
 
-(:  Get the next level collection-records (ResourceType='Metadata')
+(:
+  Get the next level collection-records (ResourceType='Metadata')
   rely on the ResourceProxy of the parent (param)
 :)
@@ -218 +227 @@
 };
 
-(: count ALL (independent of maxDepth) resource-records (ie actually ResourceType=Resource, but
-                        there are records without ResourceProxy[ResourceType=Resource] - so care for that (not(exists((ResourceType))))
+(: 
+  count ALL (independent of maxDepth) resource-records (ie actually ResourceType=Resource, but
+  there are records without ResourceProxy[ResourceType=Resource] - 
+  so care for that (not(exists((ResourceType))))
 :)
 declare function cmd-model:get-resource-count($handle as xs:string) as xs:string {
@@ -225 +236 @@
 };
 
-(: this is complement to cmd-model:get-resource-count()
-                 count ALL (independent of maxDepth) collection-records (ie ResourceType=Metadata                       
+(:
+  This is complement to cmd-model:get-resource-count()
+  count ALL (independent of maxDepth) collection-records 
+  (ie ResourceType=Metadata)                    
 :)
 declare function cmd-model:get-collection-count($handle as xs:string) as xs:string {
@@ -232 +245 @@
 };
 
-(: Try to derive a name from the collection-record (more-or-less agnostic about the actual schema.
+(: 
+  Try to derive a name from the collection-record (more-or-less agnostic about 
+  the actual schema.
 :)
 declare function cmd-model:get-md-collection-name($collection-doc as node()) as xs:string {
@@ -238 +253 @@
 };
 
-(: ***********************
-HELPER function - dealing with caching the results
-:)
-
-
-(: Function for telling wether the document is available or not.
-generic, currently not used
+(: 
+  ***********************
+  HELPER function - dealing with caching the results
+:)
+
+
+(: 
+  Function for telling wether the document is available or not.
+  generic, currently not used
 :)
 declare function cmd-model:is-doc-available($collection as xs:string, $doc-name as xs:string) as xs:boolean {
@@ -295 +312 @@
         $item
 };
-