[Kernel-commits] r4795 - in branches/2.11: core-api/src/main/java/no/schibstedsok/searchportal/mode/command query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform

[daniele]

Author: daniele
Date: 2007-04-12 11:08:41 +0200 (Thu, 12 Apr 2007)
New Revision: 4795

Modified:
   
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
   
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
   
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
   
branches/2.11/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueExactTitleMatchQueryTransformer.java
Log:
fixed character trouble with double quote in banner search and exact match in 
company name.

Modified: 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
===================================================================
--- 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
       2007-04-12 09:06:16 UTC (rev 4794)
+++ 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
       2007-04-12 09:08:41 UTC (rev 4795)
@@ -236,17 +236,17 @@
     @Override
     public String getTransformedQuery() {
 
-        originalQuery = super.getTransformedQuery().replaceAll(" ", 
"").toLowerCase();
+        originalQuery = super.getTransformedQuery().replaceAll(" ", 
"").replace("\"","").toLowerCase();
         String query = null;
         String completeQuery = null;
 
         if (whichQueryToRun == QueryType.GEO) {
-            query = super.getTransformedQuery().replaceAll(" ", "")
+            query = super.getTransformedQuery().replaceAll(" ", 
"").replace("\"","")
             + queryGeoString.replaceAll(" ", "");
             
             
         } else {
-            query = super.getTransformedQuery().replaceAll(" ", "")
+            query = super.getTransformedQuery().replaceAll(" ", 
"").replace("\"","")
             + DOMESTIC_SEARCH;
             
         }

Modified: 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
===================================================================
--- 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
   2007-04-12 09:06:16 UTC (rev 4794)
+++ 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
   2007-04-12 09:08:41 UTC (rev 4795)
@@ -64,7 +64,7 @@
             final Query query = rq.getQuery();
             
             queryGeoString = query.getQueryString();
-            queryGeoString = queryGeoString.replaceAll(" ", "");
+            queryGeoString = queryGeoString.replaceAll(" ", "").replace("\"", 
"");
         }else{
             queryGeoString = "";
         }

Modified: 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
===================================================================
--- 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
  2007-04-12 09:06:16 UTC (rev 4794)
+++ 
branches/2.11/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
  2007-04-12 09:08:41 UTC (rev 4795)
@@ -123,6 +123,11 @@
      */
     private static final String PARAMETER_NAME_WHAT = "catalogueWhat";
     private static final String PARAMETER_NAME_WHERE = "catalogueWhere";
+    
+    /**
+     *  Represents a blank value in the query.
+     */
+    private static final String BLANK=""; 
 
     /**
      * Creates a new catalogue search command.
@@ -386,7 +391,7 @@
             
                 appendToQueryRepresentation(createPhraseQuerySyntax('\"' + 
getTransformedTerms().get(clause) + '\"'));
             
-            }else if(!getTransformedTerms().get(clause).equals("")) {
+            }else if(!getTransformedTerms().get(clause).equals(BLANK)) {
                 
                 final Query query = 
context.getDataModel().getQuery().getQuery();
                 
@@ -459,7 +464,7 @@
         }
 
         if(useTerm){
-            if (!getTransformedTerms().get(clause).equals("")) {
+            if (!getTransformedTerms().get(clause).equals(BLANK)) {
                 appendToQueryRepresentation(
                         
createPhraseQuerySyntax(getTransformedTerms().get(clause)));
             }

Modified: 
branches/2.11/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueExactTitleMatchQueryTransformer.java
===================================================================
--- 
branches/2.11/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueExactTitleMatchQueryTransformer.java
  2007-04-12 09:06:16 UTC (rev 4794)
+++ 
branches/2.11/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueExactTitleMatchQueryTransformer.java
  2007-04-12 09:08:41 UTC (rev 4795)
@@ -24,7 +24,13 @@
 
        @Override
        public String getTransformedQuery() {
-               return 
"iypnavnvisningnorm:^\""+super.getTransformedQuery()+"\"$";
+            
+            // get the search query as entered by the user, remove " characters
+            // and use it to match against compnay name fields in the index.
+            String query = super.getTransformedQuery().replace("\"", "");
+            
+            return "iypnavnvisningnorm:^\""+query+"\"$ OR "+
+                   "iypnavnvisning:^\""+query+"\"$";
        }
 
 }

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits