Changeset 800 for MDRepository

Timestamp:

10/17/10 21:52:22 (14 years ago)

Author:

vronk

Message:

small but important change to get-children-colls()

File:

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

MDRepository/trunk/xquery/cmd-model.xqm

@@ -123 +123 @@
         $text-count-distinct := count(distinct-values($text-nodes))
         return 
+(:      <Term path="{fn:concat("//", $path)}" name="{text:groups($path, "/([^/]+)$")[last()]}" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{ :)
         <Term path="{fn:concat("//", $path)}" name="{(text:groups($path, "/([^/]+)$")[last()],$path)[1] }" count="{$path-count}" count_text="{$text-count}"  count_distinct_text="{$text-count-distinct}">{
           if ($depth > 0) then
@@ -219 +220 @@
 :)
 declare function cmd-model:get-children-colls($collection as node()+) as node()* {
-        let $proxies := $collection//ResourceProxy[ResourceType='Metadata']/ResourceRef
+(:      let $proxies := $collection//ResourceProxy[ResourceType='Metadata']/ResourceRef :)
         let $handle := $collection//MdSelfLink
+  return collection($cmd-model:cmdiMirrorPath)//IsPartOf[@level=1][matches(.,$handle)]/ancestor::CMD[descendant::ResourceType[. = "Metadata"]] 
+(: this turned out to be very inefficient!!:
         return collection($cmd-model:cmdiMirrorPath)//CMD[descendant::MdSelfLink = $proxies/.][descendant::ResourceType = "Metadata"]   
-
-(: alternatively we could rely on IsPartOf + IsPartOf/@level
-  return collection($cmd-model:cmdiMirrorPath)//IsPartOf[. eq $handle]/ancestor::CMD[descendant::ResourceType[. = "Metadata"]] :)
+:)
   };