Author: fchrist
Date: Wed Jun 6 08:24:11 2012
New Revision: 1346774
URL: http://svn.apache.org/viewvc?rev=1346774&view=rev
Log:
STANBOL-639 merging fix for STANBOL-654 from trunk
Modified:
incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/ (props
changed)
incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
Propchange: incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/stanbol/trunk/entityhub:1346304
Modified:
incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java?rev=1346774&r1=1346773&r2=1346774&view=diff
==============================================================================
---
incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
(original)
+++
incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
Wed Jun 6 08:24:11 2012
@@ -186,7 +186,7 @@ public final class QueryUtils {
Matcher m = wILDCARD_QUERY_CHAR_PATTERN.matcher(value);
int next = m.find()?m.start()+1:-1;
if(next < 0){ //No wildcard
- return new String[]{value};
+ return new String[]{'"'+value+'"'};
}
ArrayList<String> queryElements = new ArrayList<String>(5);
int lastAdded = -1;
@@ -206,14 +206,15 @@ public final class QueryUtils {
// 'at' as active Token and we need write "wildcar?"
as
// query term
// (2) [wild,ard,within,the,word]: In this case this is
called with
- // 'ard' as active Tiken and we need write "wild?ard"
as
+ // 'ard' as active Token and we need write "wild?ard"
as
// query term.
if(offset.startOffset() > lastOffset+1) {//(1)
String queryElement =
value.substring(lastAdded,lastOffset+1);
if(loewercaseWildcardTokens){
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;
@@ -222,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;
}
@@ -233,7 +234,8 @@ public final class QueryUtils {
//NOTE: ignore if foundWildcard is TRUE (multiple
wildcards in
// a single word
if(!foundWildcard && lastAdded<lastOffset){
-
queryElements.add(value.substring(lastAdded,lastOffset));
+ String queryElement =
value.substring(lastAdded,lastOffset);
+ queryElements.add('"'+queryElement+'"');
lastAdded = offset.startOffset();
}//else multiple wildcards in a single token
foundWildcard = true;
@@ -249,7 +251,7 @@ public final class QueryUtils {
if(foundWildcard && loewercaseWildcardTokens){
queryElement = queryElement.toLowerCase();
}
- queryElements.add(queryElement);
+ queryElements.add('"'+queryElement+'"');
}
return queryElements.toArray(new String[queryElements.size()]);
}
