commit 28620f8fd32452a38bf6ae56d44e72a002f47d8f
author Karl Wright <kwright@apache.org> Wed Aug 31 11:15:42 2016 +0000
committer Karl Wright <kwright@apache.org> Wed Aug 31 11:15:42 2016 +0000
tree 3d8d00612d1b1ad40300c5acb2f5018330c98b2f
parent ccc764ba853fe7bf68601cc521148047a6c180ac

Bring in some code from master.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch-2.0/trunk@1758583 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java

diff --git a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
index 60c38e2..19690f0 100644
--- a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
+++ b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
@@ -31,7 +31,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.*;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.action.support.RestActions;
@@ -41,6 +40,7 @@
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.search.suggest.SuggestBuilders;
 import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
+import org.elasticsearch.common.unit.TimeValue;
 
 import java.io.*;
 
@@ -93,17 +93,20 @@
             searchRequest.source(modifiedJSON.toString());
           }
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new MCFAuthorizerException("JSON parser error");
+            throw new MCFAuthorizerException("JSON parser error: "+e.getMessage(),e);
           }
       }
 
+      //parseSearchSource(searchRequest.source(), request);
       searchRequest.extraSource(parseSearchSourceMCF(request));
       searchRequest.searchType(request.param("search_type"));
-      //TODO: figure out if we still need this??? searchRequest.queryCache(request.paramAsBoolean("query_cache", (Boolean)null));
+      
+      // Should this be done?
+      searchRequest.requestCache(request.paramAsBoolean("request_cache", null));
+
       String scroll = request.param("scroll");
-      if(scroll != null) {
-        //TODO: figure out if we still need this??? searchRequest.scroll(new Scroll(TimeValue.parseTimeValue(scroll, (TimeValue)null)));
+      if (scroll != null) {
+        searchRequest.scroll(new Scroll(TimeValue.parseTimeValue(scroll, null, "scroll")));
       }
 
       searchRequest.types(Strings.splitStringByCommaToArray(request.param("type")));