merge

tomcat/webapps/Trawl/histogram.js

@@ -19,6 +19,7 @@ function histogram(x,y){
 	      			size: 18,
 	      			color: '#7f7f7f'
 	    			}
+		, autosize: true
 	    	},
 	    	yaxis:{title: 'Individual count',
 	    		titlefont: {

tomcat/webapps/Trawl/histogram.jsp

@@ -5,13 +5,18 @@
 
 <%
 		TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
-		BasicSearchResult result = te.rangeSearch(2, 1960, 2016);
+		JSONParser parser = new JSONParser();
+		JSONObject req = (JSONObject) parser.parse(request.getReader().readLine());
+
+		Integer taxonId = (int) (long) req.get("taxId");
+		Integer yearLo = (int) (long) req.get("yearF");
+		Integer yearHi = (int) (long) req.get("yearT");
+
+		BasicSearchResult result = te.rangeSearch(taxonId, yearLo, yearHi);
 
 		BST<Integer, Integer> histogram = result.histogram();
 		Iterable<Integer> results = histogram.keys();
 		
-		JSONParser parser = new JSONParser();
-		
 		
 		JSONObject js = new JSONObject();
 		JSONArray x = new JSONArray();

tomcat/webapps/Trawl/script.js

@@ -199,7 +199,7 @@ function callOutput(){
     var params= JSON.stringify({taxId: Number(taxGroup), yearF: Number(yearFrom), yearT: Number(yearTo)});
 
     //Switch Output Display
-    if(outType === "Histogram"){
+    if(outType === "histogram"){
         reqHistogram(params);
     }
     else{