feature #19. also fix small bug in aggregations result cause to empty row

Author: omershelef

src/_site/controllers.js

@@ -1,7 +1,7 @@
 var elasticsearchSqlApp = angular.module('elasticsearchSqlApp', ["ngAnimate", "ngSanitize"]);
 
 elasticsearchSqlApp.controller('MainController', function ($scope, $http, $sce) {
-	$scope.url = "http://localhost:9200";
+	$scope.url = getUrl();
 	$scope.error = "";	
 	$scope.resultsColumns = [];
 	$scope.resultsRows = [];
@@ -15,9 +15,11 @@ elasticsearchSqlApp.controller('MainController', function ($scope, $http, $sce)
 		$scope.loading = true;
 		$scope.$apply();
 
+		saveUrl()
+
         var query = window.editor.getValue();
 
-		$http.post($scope.url + "/_sql", query)
+		$http.post($scope.url + "_sql", query)
 		.success(function(data, status, headers, config) {
           var handler = ResultHandlerFactory.create(data);
           $scope.resultsColumns = handler.getHead();
@@ -42,5 +44,28 @@ elasticsearchSqlApp.controller('MainController', function ($scope, $http, $sce)
 		var loadingContent = "<span class=\"glyphicon glyphicon-refresh glyphicon-refresh-animate\"></span> Loading...";
 		var returnValue = isLoading ? loadingContent : "Search";
 		return $sce.trustAsHtml(returnValue);
+	}
+
+
+	function getUrl() {
+		var url = localStorage.getItem("lasturl");
+		if(url == undefined) {
+			if(location.protocol == "file") {
+				url = "http://localhost:9200"
+			}
+			else {
+				url = location.protocol+'//' + location.hostname + (location.port ? ':'+location.port : '');
+			}
+		}
+		
+		if(url.substr(url.length - 1, 1) != '/') {
+			url += '/'
+		}
+
+		return url
+	}
+
+	function saveUrl() {
+		localStorage.setItem("lasturl", $scope.url);
 	} 
 });

src/_site/query.js

@@ -91,21 +91,23 @@ var AggregationQueryResultHandler = function(data) {
       }
     }
 
-    var obj = $.extend({}, additionalColumns)
-    if(bucketName != undefined) {
-      obj[bucketName] = bucket.key
-    }
-
-    for(var field in bucket) {              
-      if(bucket[field].value != undefined) {
-        obj[field] = bucket[field].value
+    else {
+      var obj = $.extend({}, additionalColumns)
+      if(bucketName != undefined) {
+        obj[bucketName] = bucket.key
       }
-      else {
-        continue;
+
+      for(var field in bucket) {              
+        if(bucket[field].value != undefined) {
+          obj[field] = bucket[field].value
+        }
+        else {
+          continue;
+        }
       }
+      rows.push(obj)
     }
 
-    rows.push(obj)
     return rows
   }
 

src/_site/tests/spec/ResultHandlersSpec.js

@@ -105,12 +105,11 @@ describe("AggregationQueryResultHandler", function() {
   });
 
 
-  /* TODO make this test pass.
-  Add test that take complex aggregation result with
-  some buckets. */
   it("should return the expected body", function() {  
     var body = handler.getBody();
     expect(angular.equals(body, expectedBody)).toBe(true);
   });
 
+  // TODO add nested aggregations test.
+
 });

src/test/java/org/nlpcn/es4sql/MainTestSuite.java

@@ -61,14 +61,17 @@ private static InetSocketTransportAddress getTransportAddress() {
 		String host = System.getenv("ES_TEST_HOST");
 		String port = System.getenv("ES_TEST_PORT");
 
-		if(host == null || port == null) {
+		if(host == null) {
 			host = "localhost";
-			port = "9300";
+			System.out.println("ES_TEST_HOST enviroment variable does not exist. choose default 'localhost'");
+		}
 
-			System.out.println("ES_TEST_HOST AND ES_TEST_PORT enviroment variables does not exist.");
-			System.out.println(String.format("Using defaults. host: %s. port:%s.", host, port));
+		if(port == null) {
+			port = "9300";
+			System.out.println("ES_TEST_PORT enviroment variable does not exist. choose default '9300'");
 		}
 
+		System.out.println(String.format("Connection details: host: %s. port:%s.", host, port));
 		return new InetSocketTransportAddress(host, Integer.parseInt(port));
 	}