You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2016/07/06 18:58:12 UTC
[3/6] lucene-solr:master: SOLR-9193: Fix conflict between parameters
of TermsComponent and json facet API
SOLR-9193: Fix conflict between parameters of TermsComponent and json facet API
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ad8b22d0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ad8b22d0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ad8b22d0
Branch: refs/heads/master
Commit: ad8b22d0b2a05425fbd51bd01ddb621a1ebe98b4
Parents: 360c4da
Author: jbernste <jb...@apache.org>
Authored: Tue Jul 5 00:48:16 2016 -0400
Committer: jbernste <jb...@apache.org>
Committed: Wed Jul 6 14:06:38 2016 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/component/TermsComponent.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ad8b22d0/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
index daf5b5b..076c4eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
@@ -65,7 +65,9 @@ public class TermsComponent extends SearchComponent {
@Override
public void prepare(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
- if (params.getBool(TermsParams.TERMS, false)) {
+
+ //the terms parameter is also used by json facet API. So we will get errors if we try to parse as boolean
+ if (params.get(TermsParams.TERMS, "false").equals("true")) {
rb.doTerms = true;
} else {
return;
@@ -86,7 +88,9 @@ public class TermsComponent extends SearchComponent {
@Override
public void process(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
- if (!params.getBool(TermsParams.TERMS, false)) return;
+ if (!params.get(TermsParams.TERMS, "false").equals("true")) {
+ return;
+ }
String[] fields = params.getParams(TermsParams.TERMS_FIELD);