honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Search API: Allow to pass the body JSON also as a parameter named 'source', closes #140.

This commit is contained in:
kimchy 2010-04-17 13:34:04 +03:00
parent 3e430c2ca9
commit c6d13212b6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
View File

@ -32,6 +32,7 @@ import org.elasticsearch.rest.*;
import org.elasticsearch.rest.action.support.RestActions;
import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.util.Unicode;
import org.elasticsearch.util.json.JsonBuilder;
import org.elasticsearch.util.settings.Settings;
@ -116,6 +117,11 @@ public class RestSearchAction extends BaseRestHandler {
// get the content, and put it in the body
if (request.hasContent()) {
searchRequest.source(request.contentAsBytes());
} else {
String source = request.param("source");
if (source != null) {
searchRequest.source(Unicode.fromStringAsBytes(source));
}
}
// add extra source based on the request parameters
searchRequest.extraSource(parseSearchSource(request));