Author: ssmiweve
Date: 2009-01-06 14:51:44 +0100 (Tue, 06 Jan 2009)
New Revision: 7129

Modified:
   
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrTokenEvaluator.java
   
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
Log:
SEARCH-5370 Yellow search command bug, capital letters => different results

Modified: 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrTokenEvaluator.java
===================================================================
--- 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrTokenEvaluator.java
      2009-01-05 19:25:20 UTC (rev 7128)
+++ 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrTokenEvaluator.java
      2009-01-06 13:51:44 UTC (rev 7129)
@@ -280,7 +280,7 @@
                     }while (more);
 
 
-                    result = Collections.unmodifiableMap(result);
+                    result = 
Collections.<String,List<TokenMatch>>unmodifiableMap(result);
                     CACHE_QUERY.putInCache(query, result);
                     updatedCache = true;
 
@@ -338,7 +338,7 @@
         // Strip out SKIP characters we are not interested in.
         // Also remove any operator characters. (SEARCH-3883 & SEARCH-3967)
 
-        return string
+        return string.toLowerCase()
                 .replaceAll(" ", "xxKEEPWSxx") // Hack to keep spaces. 
multiple spaces always normalised.
                 .replaceAll(SKIP_REGEX, " ")
                 .replaceAll("xxKEEPWSxx", " ") // Hack to keep spaces.

Modified: 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
===================================================================
--- 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
  2009-01-05 19:25:20 UTC (rev 7128)
+++ 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
  2009-01-06 13:51:44 UTC (rev 7129)
@@ -515,7 +515,7 @@
         // Strip out SKIP characters we are not interested in.
         // Also remove any operator characters. (SEARCH-3883 & SEARCH-3967)
 
-        return string
+        return string.toLowerCase()
                 .replaceAll(" ", "xxKEEPWSxx") // Hack to keep spaces. 
multiple spaces always normalised.
                 .replaceAll(SKIP_REGEX, " ")
                 .replaceAll("xxKEEPWSxx", " ") // Hack to keep spaces.

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to