Changeset 2197

Timestamp:

21/02/07 12:40:22 (14 years ago)

Author:

mpritcha

Message:

Fixed slow response due to unnecessary use of <document> wrappers in intermediate result sets within xquery.

File:

• TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/SearchAgent.java (modified) (6 diffs)

TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/SearchAgent.java

@@ -559 +559 @@
 "   let $s_result := ( \n"+
 "       for $j in $result/sql:row/id/text() \n"+
-"       return <document>{$j}</document> \n"+
+"       return $j \n"+
 "   ) \n"+
 "   return $s_result \n"+
@@ -567 +567 @@
 "   let $result := __subst_term__ \n"+
 "   for $i in $result \n"+
-"      return <document>{util:document-name($i)}</document> \n"+
+"      return util:document-name($i) \n"+
 "}; \n"+
 "declare function local:mergeResults($arg1 as item()*, $arg2 as item()*) as item()* { \n"+
-"   for $i in $arg1[./text()=$arg2/text()] \n"+
-"   return <document>{$i/text()}</document> \n"+
+"   for $i in $arg1[.=$arg2] \n"+
+"   return $i \n"+
 "}; \n"+
 "declare function local:filterByScope($arg1 as item()*) as item()* { \n"+
@@ -577 +577 @@
 "      for $i in $arg1 \n"+
 "       let $coll := '/db/discovery/moles' \n"+
-"       let $thisdoc := $i/text() \n"+
+"       let $thisdoc := $i \n"+
 "       let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
 "       let $molesdoc := document( $name ) \n"+
@@ -590 +590 @@
 "         for $i in $arg1 \n"+
 "         let $coll := '/db/discovery/moles' \n"+
-"         let $thisdoc := $i/text() \n"+
+"         let $thisdoc := $i \n"+
 "         let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
 "         order by document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart descending \n"+
@@ -598 +598 @@
 "         for $i in $arg1 \n"+
 "         let $coll := '/db/discovery/moles' \n"+
-"         let $thisdoc := $i/text() \n"+
+"         let $thisdoc := $i \n"+
 "         let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
 "         order by document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart ascending \n"+
@@ -641 +641 @@
 "}; \n"+
 "for $i in local:buildResult() \n"+
-"return $i \n";
+"return <document>{$i}</document> \n";
 
 }