Changeset 831 for MDRepository

Timestamp:

11/02/10 15:25:34 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - fixing some small stuff before going on with changes.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -72 +72 @@
 :)
 declare function cmd-model:search-retrieve($xpath-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 $start-time := fn:current-dateTime(),
-  $collection := collection($cmd-model:cmdiMirrorPath),
+  let $start-time := util:system-dateTime(),
+    $collection := collection($cmd-model:cmdiMirrorPath),
     $decoded-query := xdb:decode($xpath-query),
     $sanitized-query := cmd-model:sanitize-query($decoded-query),
@@ -85 +85 @@
     $result-seq := fn:subsequence($results, $start-item, $end-item),
     $seq-count := fn:count($result-seq),
-    $end-time := fn:current-dateTime(),
+    $end-time := util:system-dateTime(),
     $result-fragment :=
     <searchRetrieveResponse>
@@ -126 +126 @@
                         $coll-names-value := if (fn:empty($collections)) then () else attribute colls {fn:string-join($collections, ",")},
                 $result := element {$cmd-model:docTypeTerms} {
-                                                                                                        $coll-names-value,
-                                                                                                            attribute depth {$depth},                                                                                                       
-                                                                                                            attribute created {fn:current-dateTime()},
-                                                                                                            $entries  
-                                                                                                }
+                  $coll-names-value,
+                  attribute depth {$depth}, 
+                  attribute created {fn:current-dateTime()},
+                  $entries  
+                }
     return $result              
 };
@@ -288 +288 @@
 };
 
-(:  Store the collection listing for given collection.
+(:  
+  Store the collection listing for given collection.
 :)
 declare function cmd-model:store-in-cache($doc-name as xs:string, $data as node()) as item()* {
@@ -296 +297 @@
   $stored-doc := fn:doc(concat($cmd-model:cachePath, "/", $doc-name))
   return $stored-doc
-  (: moved to get-collection
-        $coll-count := update value $stored-doc/Collections/@count with sum($stored-doc//c[not(c)]/@cnt)
-  return 
-  for $i in $stored-doc//c[c][@cnt eq "-1"]
-  return update value $i/@cnt with sum($i//c[not(c)]/@cnt)
-                        :)
-};
-
-(:
-  Create document name with md5-hash for selected collections (or types) for reuse.
+};
+
+(:
+  Create document name with md5-hash for selected collections (or types) 
+  for reuse.
 :)
 declare function cmd-model:gen-cache-id($type-name as xs:string, $keys as xs:string+, $depth as xs:string) as xs:string {