|
@@ -431,7 +431,7 @@ public class QueryHelper implements Serializable {
|
|
buf.append('*');
|
|
buf.append('*');
|
|
}
|
|
}
|
|
appendQueryValue(buf, targetWord, isInUrl ? false
|
|
appendQueryValue(buf, targetWord, isInUrl ? false
|
|
- : useBigram);
|
|
|
|
|
|
+ : isBigramField(field));
|
|
if (isInUrl) {
|
|
if (isInUrl) {
|
|
buf.append('*');
|
|
buf.append('*');
|
|
}
|
|
}
|
|
@@ -444,7 +444,7 @@ public class QueryHelper implements Serializable {
|
|
queryBuf.append('*');
|
|
queryBuf.append('*');
|
|
}
|
|
}
|
|
appendQueryValue(queryBuf, targetWord, isInUrl ? false
|
|
appendQueryValue(queryBuf, targetWord, isInUrl ? false
|
|
- : useBigram);
|
|
|
|
|
|
+ : isBigramField(field));
|
|
if (isInUrl) {
|
|
if (isInUrl) {
|
|
queryBuf.append('*');
|
|
queryBuf.append('*');
|
|
}
|
|
}
|
|
@@ -903,12 +903,13 @@ public class QueryHelper implements Serializable {
|
|
if (notOperatorFlag) {
|
|
if (notOperatorFlag) {
|
|
final StringBuilder buf = new StringBuilder(100);
|
|
final StringBuilder buf = new StringBuilder(100);
|
|
buf.append(prefix);
|
|
buf.append(prefix);
|
|
- appendQueryValue(buf, targetWord, useBigram);
|
|
|
|
|
|
+ appendQueryValue(buf, targetWord, isBigramField(field));
|
|
notOperatorList.add(buf.toString());
|
|
notOperatorList.add(buf.toString());
|
|
notOperatorFlag = false;
|
|
notOperatorFlag = false;
|
|
} else {
|
|
} else {
|
|
queryBuf.append(prefix);
|
|
queryBuf.append(prefix);
|
|
- appendQueryValue(queryBuf, targetWord, useBigram);
|
|
|
|
|
|
+ appendQueryValue(queryBuf, targetWord,
|
|
|
|
+ isBigramField(field));
|
|
queryOperandCount++;
|
|
queryOperandCount++;
|
|
}
|
|
}
|
|
nonPrefix = true;
|
|
nonPrefix = true;
|
|
@@ -1002,6 +1003,14 @@ public class QueryHelper implements Serializable {
|
|
buf.append(')');
|
|
buf.append(')');
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ protected boolean isBigramField(String field) {
|
|
|
|
+ if (fieldHelper.titleField.equals(field)
|
|
|
|
+ || fieldHelper.contentField.equals(field)) {
|
|
|
|
+ return useBigram;
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
|
protected String getQueryLanguage() {
|
|
protected String getQueryLanguage() {
|
|
final String[] supportedLanguages = systemHelper
|
|
final String[] supportedLanguages = systemHelper
|
|
.getSupportedLanguages();
|
|
.getSupportedLanguages();
|