Changeset 1812 for TI01-discovery/trunk/ws-Discovery2

Timestamp:

05/12/06 09:58:03 (13 years ago)

Author:

mpritcha

Message:

Used Matcher.quoteReplacement() to avoid problems inserting orderByField into xquery.

File:

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

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

@@ -15 +15 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-
+import java.util.regex.Matcher;
 import javax.xml.namespace.*;
 import javax.xml.xpath.*;
@@ -50 +50 @@
         String term = "";
         String orderBy;                                                 // representation used in WSDL e.g. "date", "dataCentre"
-        String orderByField = "";                               // xquery / xpath expression representing orderBy field
+        String orderByField = "document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart";                              // xquery / xpath expression representing orderBy field
         String orderByDirection = "ascending";  //default orderBy direction
         // TODO ...add orderByDirection (and to WSDL)
@@ -120 +120 @@
                 if ( s.equals("date") )
                 {
-                        this.orderByField = "{document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart}";
+                        this.orderByField = "document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart";
                 }
 
@@ -126 +126 @@
                 {
                         // TODO ...not correct yet (should look up Organisation moles record)
-                        this.orderByField = "{document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataRoles/dgDataCurator/dgRoleHolder/dgOrganisationID/repositoryIdentifier}";
+                        this.orderByField = "document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataRoles/dgDataCurator/dgRoleHolder/dgOrganisationID/repositoryIdentifier";
                 }
         }
@@ -419 +419 @@
                         xqueryStr = xqueryStr.replaceFirst("__subst_doTerm__", this.doTerm ? "fn:true()" : "fn:false()");
                         xqueryStr = xqueryStr.replaceFirst("__subst_doSpatioTemp__", (this.doSpatio | this.doTemporal) ? "fn:true()" : "fn:false()");
-                        xqueryStr = xqueryStr.replaceFirst("__subst_doOrderBy__", this.doOrderBy ? "fn:true()" : "fn:false()");
+                        xqueryStr = xqueryStr.replaceFirst("__subst_doOrderBy__", this.doOrderBy ? "fn:true()" : "fn:false()"); //NB replaceAll cos more than 1! 
                         xqueryStr = xqueryStr.replaceFirst("__subst_doScope__", this.doScope ? "fn:true()" : "fn:false()");
+                        
+                        // orderByField contains $ chars etc so needs special treatment to avoid "java.lang.IllegalArgumentException: Illegal group reference" when replacing
+                        String orderByFieldReplace = Matcher.quoteReplacement(this.orderByField);
+                        xqueryStr = xqueryStr.replaceAll("__subst_orderByField__", orderByFieldReplace); //NB replaceAll cos more than 1! 
 
                         System.out.println("Xquery was \n" + xqueryStr);
@@ -531 +535 @@
 "   \"__subst_scope__\" \n"+
 "}; \n"+
-"declare function local:getOrderByField() as xs:string { \n"+
-"   \"__subst_orderByField__\" \n"+
-"}; \n"+
 "declare function local:getSpatioTempWhereClause() as xs:string { \n"+
 "   \"__subst_spatioTempWhereClause__\" \n"+
@@ -575 +576 @@
 "      for $i in $arg1 \n"+
 "       let $coll := '/db/discovery/moles' \n"+
-"       let $thisdoc := util:document-name($i) \n"+
+"       let $thisdoc := $i/text() \n"+
 "       let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
 "       let $molesdoc := document( $name ) \n"+
@@ -587 +588 @@
 "      if ( local:getOrderByDirection() = \"descending\" ) then ( \n"+
 "         for $i in $arg1 \n"+
-"         order by local:getOrderByField() descending \n"+
+"         let $coll := '/db/discovery/moles' \n"+
+"         let $thisdoc := $i/text() \n"+
+"         let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
+"         order by document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart descending \n"+
 "         return $i \n"+
 "      ) \n"+
 "      else ( \n"+
 "         for $i in $arg1 \n"+
-"         order by local:getOrderByField() ascending \n"+
+"         let $coll := '/db/discovery/moles' \n"+
+"         let $thisdoc := $i/text() \n"+
+"         let $name := string-join( ($coll , $thisdoc), '/' ) \n"+
+"         order by document($name)/dgMetadata/dgMetadataRecord/dgDataEntity/dgDataSummary/dgDataCoverage/dgTemporalCoverage/DateRange/DateRangeStart ascending \n"+
 "         return $i \n"+
 "      ) \n"+