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

fix #508 : append geoinfo query

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-05-16 22:40:13 +09:00
parent 5e7d09428a
commit 2447e951c5
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
View file

@ -55,6 +55,10 @@ import org.codelibs.fess.util.DocumentUtil;
import org.codelibs.fess.util.FacetResponse;
import org.codelibs.fess.util.FacetResponse.Field;
import org.dbflute.optional.OptionalThing;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.script.Script;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
@ -153,6 +157,7 @@ public class JsonApiManager extends BaseApiManager {
final String allPageCount = Integer.toString(data.getAllPageCount());
final List<Map<String, Object>> documentItems = data.getDocumentItems();
final FacetResponse facetResponse = data.getFacetResponse();
final GeoInfo geoInfo = params.getGeoInfo();
buf.append("\"q\":");
buf.append(escapeJson(query));
@ -254,6 +259,16 @@ public class JsonApiManager extends BaseApiManager {
}
buf.append(']');
}
if (geoInfo != null && geoInfo.toQueryBuilder() != null) {
buf.append(',');
buf.append("\"geo\":");
try {
XContentBuilder builder = XContentFactory.jsonBuilder();
buf.append(geoInfo.toQueryBuilder().toXContent(builder, ToXContent.EMPTY_PARAMS).string());
} catch (Exception e) {
buf.append("{ \"error\" : \"").append(ExceptionsHelper.detailedMessage(e)).append("\"}");
}
}
}
} catch (final Exception e) {
status = 1;