_score and _type options NLPchina#150

eliranmoyal · eliranmoyal · commit 7167ec245f9a · 2016-02-19T20:51:46.000+02:00
diff --git a/src/_site/controllers.js b/src/_site/controllers.js
@@ -16,7 +16,7 @@ elasticsearchSqlApp.controller('MainController', function ($scope, $http, $sce,$
   
 	$scope.scrollId = undefined;
   $scope.amountDescription = "";
-  var optionsKey = "essql-options";
+  var optionsKey = "essql-options-v1";
   var fetched = 0;
   var total = 0 ;
   //checkboxes
@@ -36,7 +36,9 @@ elasticsearchSqlApp.controller('MainController', function ($scope, $http, $sce,$
       scrollSize : 10,
       alwaysScroll : false,
       isAutoSave : false,
-      delimiter : ','
+      delimiter : ',',
+      showScore : false,
+      showType : false
     }
     if (typeof(Storage) !== "undefined") {
       options = localStorage.getItem(optionsKey);
@@ -80,7 +82,7 @@ $scope.fetchAll = function(){
 
 		$http.get($scope.url + scroll_url + $scope.scrollId)
 		.success(function(data, status, headers, config) {
-          var handler = ResultHandlerFactory.create(data,$scope.config.isFlat);
+          var handler = ResultHandlerFactory.create(data,$scope.config.isFlat,$scope.config.showScore,$scope.config.showType);
           updateDescription(handler);
           var body = handler.getBody()
 
@@ -160,7 +162,7 @@ function updateWithScrollIfNeeded (query) {
     query = updateWithScrollIfNeeded(query);
 		$http.post($scope.url + "_sql", query)
 		.success(function(data, status, headers, config) {
-          var handler = ResultHandlerFactory.create(data,$scope.config.isFlat);
+          var handler = ResultHandlerFactory.create(data,$scope.config.isFlat,$scope.config.showScore,$scope.config.showType);
           updateDescription(handler);
           if(handler.isScroll){
           	$scope.showResults=true;
diff --git a/src/_site/index.html b/src/_site/index.html
@@ -122,6 +122,12 @@ <h4 class="panel-title">
           <div class="checkbox">
             <label><input type="checkbox" ng-model="config.useOldTable" ng-change="onChangeTablePresnterType()" value="">Old Table</label>
           </div>
+          <div class="checkbox">
+            <label><input type="checkbox" ng-model="config.showScore" ng-change="onChangeTablePresnterType()" value="">Show Score</label>
+          </div>
+          <div class="checkbox">
+            <label><input type="checkbox" ng-model="config.showType" ng-change="onChangeTablePresnterType()" value="">Show Type</label>
+          </div>
           <div class="checkbox">
             <label><input type="checkbox" ng-model="config.alwaysScroll" ng-change="alwatsScrollChanged()" value="">always scroll</label>
           </div>
diff --git a/src/_site/query.js b/src/_site/query.js
@@ -3,7 +3,7 @@
  Returns the right Result Handler depend
  on the results */
 var ResultHandlerFactory = {
-    "create": function(data,isFlat) {
+    "create": function(data,isFlat,showScore,showType) {
         function isSearch(){
             return "hits" in data
         }
@@ -16,7 +16,8 @@ var ResultHandlerFactory = {
         }
 
         if(isSearch()){
-            return isAggregation() ? new AggregationQueryResultHandler(data) : new DefaultQueryResultHandler(data,isFlat)
+            return isAggregation() ? new AggregationQueryResultHandler(data) : 
+            new DefaultQueryResultHandler(data,isFlat,showScore,showType)
         }
 
         if(isDelete()){
@@ -35,7 +36,7 @@ var ResultHandlerFactory = {
  in case of regular query
  (Not aggregation)
  */
-var DefaultQueryResultHandler = function(data,isFlat) {
+var DefaultQueryResultHandler = function(data,isFlat,showScore,showType) {
 
     // createScheme by traverse hits field
     function createScheme() {
@@ -47,6 +48,7 @@ var DefaultQueryResultHandler = function(data,isFlat) {
             if(isFlat){
                 findKeysRecursive(scheme,header,"");
             }
+
             else {
                 for(key in header) {
 
@@ -57,14 +59,22 @@ var DefaultQueryResultHandler = function(data,isFlat) {
             }
             
         }
+        if(showType){
+            scheme.push("_type");
+        }
+        if(showScore){
+            scheme.push("_score");
+        }
         return scheme
     }
     
 
     this.data = data
     this.head = createScheme()
     this.isFlat = isFlat;
-    this.scrollId = data["_scroll_id"]
+    this.showScore = showScore;
+    this.showType = showType;
+    this.scrollId = data["_scroll_id"];
     this.isScroll = this.scrollId!=undefined && this.scrollId!="";
 };
 
@@ -92,6 +102,12 @@ DefaultQueryResultHandler.prototype.getBody = function() {
         if(this.isFlat){
             row = flatRow(this.head,row);
         }
+        if(this.showType){
+            row["_type"] = hits[i]._type
+        }
+        if(this.showScore){
+            row["_score"] = hits[i]._score
+        }
         body.push(row)
     }
     return body
