0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #154

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-04-10 06:43:58 +09:00
parent 76785f3376
commit 2d4ff7e3dc
2 changed files with 261 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/jp/sf/fess/helper/QueryHelper.java
View file

@ -85,6 +85,8 @@ public class QueryHelper implements Serializable {
private static final String _AND_ = " AND ";
private static final String _DEFAULT_ = " ";
private static final long serialVersionUID = 1L;
@Binding(bindingType = BindingType.MAY)
@ -174,7 +176,7 @@ public class QueryHelper implements Serializable {
/*
* (non-Javadoc)
*
*
* @see jp.sf.fess.helper.QueryHelper#build(java.lang.String)
*/
public SearchQuery build(final String query, final boolean envCondition) {
@ -321,7 +323,7 @@ public class QueryHelper implements Serializable {
final StringBuilder queryBuf = new StringBuilder(255);
final List<String> notOperatorList = new ArrayList<String>();
String operator = _AND_;
String operator = _DEFAULT_;
boolean notOperatorFlag = false;
int queryOperandCount = 0;
int contentOperandCount = 0;
@ -377,7 +379,7 @@ public class QueryHelper implements Serializable {
fieldLogWord = targetWord;
}
nonPrefix = true;
operator = _AND_;
operator = _DEFAULT_;
if (highlightFieldSet.contains(field)) {
highLightQueryList.add(targetWord);
}
@ -421,7 +423,7 @@ public class QueryHelper implements Serializable {
buildContentQueryWithLang(buf, value, queryLanguage);
notOperatorList.add(buf.toString());
operator = _AND_;
operator = _DEFAULT_;
notOperatorFlag = false;
highLightQueryList.add(value);
@ -437,7 +439,7 @@ public class QueryHelper implements Serializable {
buildContentQueryWithLang(queryBuf, value, queryLanguage);
contentOperandCount++;
operator = _AND_;
operator = _DEFAULT_;
highLightQueryList.add(value);
if (fieldLogMap != null) {
@ -450,7 +452,7 @@ public class QueryHelper implements Serializable {
StringBuilder searchQueryBuf = new StringBuilder(255);
if (queryBuf.length() > 0) {
searchQueryBuf.append(queryBuf.toString());
operator = _AND_;
operator = _DEFAULT_;
} else {
operator = StringUtil.EMPTY;
}
@ -469,7 +471,7 @@ public class QueryHelper implements Serializable {
searchQueryBuf.append(operator);
searchQueryBuf.append(NOT_);
searchQueryBuf.append(notOperator);
operator = _AND_;
operator = _DEFAULT_;
}
}
@ -792,7 +794,7 @@ public class QueryHelper implements Serializable {
final StringBuilder queryBuf = new StringBuilder(255);
final List<String> notOperatorList = new ArrayList<String>();
String operator = _AND_;
String operator = _DEFAULT_;
boolean notOperatorFlag = false;
int queryOperandCount = 0;
int contentOperandCount = 0;
@ -828,7 +830,7 @@ public class QueryHelper implements Serializable {
queryOperandCount++;
}
nonPrefix = true;
operator = _AND_;
operator = _DEFAULT_;
break;
}
}
@ -853,7 +855,7 @@ public class QueryHelper implements Serializable {
buildContentQueryWithLang(buf, value, queryLanguage);
notOperatorList.add(buf.toString());
operator = _AND_;
operator = _DEFAULT_;
notOperatorFlag = false;
} else {
// content
@ -863,7 +865,7 @@ public class QueryHelper implements Serializable {
buildContentQueryWithLang(queryBuf, value, queryLanguage);
contentOperandCount++;
operator = _AND_;
operator = _DEFAULT_;
}
}
}
@ -871,7 +873,7 @@ public class QueryHelper implements Serializable {
StringBuilder searchQueryBuf = new StringBuilder(255);
if (queryBuf.length() > 0) {
searchQueryBuf.append(queryBuf.toString());
operator = _AND_;
operator = _DEFAULT_;
} else {
operator = StringUtil.EMPTY;
}
@ -890,7 +892,7 @@ public class QueryHelper implements Serializable {
searchQueryBuf.append(operator);
searchQueryBuf.append(NOT_);
searchQueryBuf.append(notOperator);
operator = _AND_;
operator = _DEFAULT_;
}
}
@ -1478,7 +1480,7 @@ public class QueryHelper implements Serializable {
/*
* (non-Javadoc)
*
*
* @see java.lang.Object#toString()
*/
@Override

512
src/test/java/jp/sf/fess/helper/QueryHelperTest.java
View file

File diff suppressed because it is too large Load diff