svn commit: r1347454 - /incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java

[rwesten]

Author: rwesten
Date: Thu Jun  7 07:51:42 2012
New Revision: 1347454

URL: http://svn.apache.org/viewvc?rev=1347454&view=rev
Log:
STANBOL-654: Fixes the problem of quoted tokens containing wildcards

Modified:
    
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java

Modified: 
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java?rev=1347454&r1=1347453&r2=1347454&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
 (original)
+++ 
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
 Thu Jun  7 07:51:42 2012
@@ -214,7 +214,7 @@ public final class QueryUtils {
                             queryElement = queryElement.toLowerCase();
                         }
                         
-                        queryElements.add('"'+queryElement+'"');
+                        queryElements.add(queryElement);
                         lastAdded = offset.startOffset(); //previous token 
consumed
                         //set to the start of the current token
                         foundWildcard = false;
@@ -223,7 +223,7 @@ public final class QueryUtils {
                         if(loewercaseWildcardTokens){
                             queryElement = queryElement.toLowerCase();
                         }
-                        queryElements.add('"'+queryElement+'"');
+                        queryElements.add(queryElement);
                         lastAdded = -1; //consume the current token
                         foundWildcard = false;
                     }
@@ -251,7 +251,11 @@ public final class QueryUtils {
             if(foundWildcard && loewercaseWildcardTokens){
                 queryElement = queryElement.toLowerCase();
             }
-            queryElements.add('"'+queryElement+'"');
+            if(foundWildcard){
+                queryElements.add(queryElement);
+            } else {
+                queryElements.add('"'+queryElement+'"');
+            }
         }
         return queryElements.toArray(new String[queryElements.size()]);
     }