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

enable to add query boost

Browse source
This commit is contained in:
yfujita 2015-01-19 02:24:14 +09:00
parent 8d84b7a612
commit 570ccfc728
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,8 @@ public class QueryHelper implements Serializable {
protected Map<String, String[]> additionalQueryParamMap = new HashMap<String, String[]>();
protected Map<String, String> fieldBoostMap = new HashMap<String, String>();
@InitMethod
public void init() {
if (responseFields == null) {
@ -449,6 +451,8 @@ public class QueryHelper implements Serializable {
queryOperandCount++;
fieldLogWord = targetWord;
}
appendFieldBoostValue(queryBuf, field, targetWord);
nonPrefix = true;
operator = defaultOperator;
if (highlightFieldSet.contains(field)) {
@ -982,15 +986,18 @@ public class QueryHelper implements Serializable {
buf.append('(');
buf.append(fieldHelper.titleField).append(':');
appendQueryValue(buf, value, useBigram);
appendFieldBoostValue(buf, fieldHelper.titleField, value);
buf.append(_OR_);
buf.append(fieldHelper.contentField).append(':');
appendQueryValue(buf, value, useBigram);
appendFieldBoostValue(buf, fieldHelper.contentField, value);
if (StringUtil.isNotBlank(queryLanguage)) {
final String languageField = "content_" + queryLanguage;
buf.append(_OR_);
buf.append("content_");
buf.append(queryLanguage);
buf.append(languageField);
buf.append(':');
appendQueryValue(buf, value, false);
appendFieldBoostValue(buf, languageField, value);
}
buf.append(')');
}
@ -1536,6 +1543,15 @@ public class QueryHelper implements Serializable {
additionalQueryParamMap.put(key, values);
}
public void addFieldBoost(final String field, final String value) {
try {
Float.parseFloat(value);
} catch (final NumberFormatException e) {
throw new IllegalArgumentException(value + " was not number.", e);
}
fieldBoostMap.put(field, value);
}
protected String getDefaultOperator() {
final HttpServletRequest request = RequestUtil.getRequest();
if (request != null) {
@ -1550,6 +1566,14 @@ public class QueryHelper implements Serializable {
return DEFAULT_OPERATOR;
}
protected void appendFieldBoostValue(final StringBuilder buf,
final String field, final String value) {
if (fieldBoostMap.containsKey(field) && value.indexOf('^') == -1
&& value.indexOf('~') == -1) {
buf.append('^').append(fieldBoostMap.get(field));
}
}
public static class QueryPart {
protected String value;

4
src/main/resources/app.dicon
View file

@ -75,6 +75,10 @@
<initMethod name="addHighlightField">
<arg>"content"</arg>
</initMethod>
<initMethod name="addFieldBoost">
<arg>"label"</arg>
<arg>"0.0"</arg>
</initMethod>
<!--
<property name="additionalGeoQuery">"location_i_i:1"</property>
<property name="responseFields">new String[]{ "id", "docId", "score",