Changeset 681 for MDRepository

Timestamp:

09/08/10 21:05:29 (14 years ago)

Author:

ljo

Message:

cmd-model.xqm - committing before continuing with new change batch.

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -84 +84 @@
           let $child-results :=
             for $child in $children
-              let $child-doc := if (empty($child/unresolvable-uri)) then doc(concat(util:collection-name($child/root()), "/", $child/ResourceRef)) else (),
-                $child-name := ($child-doc//Corpus/Name, $child-doc//Session/Name, "UNKNOWN")[1]
+              let $child-doc := if (empty($child/unresolvable-uri)) then
+                cmd-model:get-resource-by-handle-or-collection-path(util:collection-name($child/root()), $child/ResourceRef) else (),
+                $child-name := ($child-doc//Corpus/Name, $child-doc//Session/Name, $child-doc//Collection/GeneralInfo/Name, "UNKNOWN")[1]
             return
               if (empty($child-doc)) then () (:<no-target proxy-id="{$child/@id}">{<proxy>{$child}</proxy>, <in-document>{concat(util:collection-name($child/root()), "/", util:document-name($child/root()))}</in-document>}</no-target> :) 
@@ -235 +236 @@
   Get the resource by handle or by path. 
 :)
-declare function cmd-model:get-resource-by-handle-or-collection-path($id as xs:string) as node()* {
-  (: fixme! - urldecode $id when we decide to pass them encoded from the client.  :)
-  if (starts-with($id, "test-")) then
-    collection($cmd-model:cmdiMirrorPath)//MdSelfLink[. = xdb:decode($id)]/ancestor::CMD
+declare function cmd-model:get-resource-by-handle-or-collection-path($id as xs:string, $doc-name as xs:string?) as node()* {
+  if (starts-with($id, "test-") or starts-with($id, "clarin.at") or starts-with($doc-name, "clarin.at")) then
+    collection($cmd-model:cmdiMirrorPath)//MdSelfLink[. = xdb:decode(($doc-name, $id)[1])]/ancestor::CMD
+  else if (empty($doc-name)) then
+    collection($id)//IsPartOf[. = "root"]/ancestor::CMD
   else
-    collection($id)//IsPartOf[. = "root"]/ancestor::CMD
+    doc(concat($id, "/", $doc-name))
 };
 
@@ -275 +277 @@
         for $collection-item in $collections
         return
-        for $collection-doc in cmd-model:get-resource-by-handle-or-collection-path($collection-item) return
+        for $collection-doc in cmd-model:get-resource-by-handle-or-collection-path($collection-item, ()) return
           cmd-model:recurse-collections($collection-doc, ($collection-doc//Corpus/Name, $collection-doc//Session/Name, "UNKNOWN")[1], $collection-doc//MdSelfLink, "", $max-depth)
           return