+HTTPS

src/main/java/org/ccalm/main/MainController.java

@@ -127,7 +127,7 @@ public class MainController implements ServletContextAware {
 	//Returns data for building a map on the first index page 
 	@RequestMapping(value = "/dataindex",method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json; charset=utf-8")
     @ResponseBody
-    public Object ajaxIndexData(HttpServletResponse response,@ModelAttribute User user,@RequestParam(required=false,name="date_start",defaultValue = "null") String date_start,@RequestParam(required=false,name="date_end",defaultValue = "null") String date_end, @RequestParam(required=false,name="lng") String language_id) {
+    public Object ajaxIndexData(HttpServletResponse response,@ModelAttribute User user,@RequestParam(required=false,name="date_start") String date_start,@RequestParam(required=false,name="date_end") String date_end, @RequestParam(required=false,name="lng") String language_id) {
 		String headerValue = CacheControl.maxAge(60, TimeUnit.SECONDS).getHeaderValue();
 		response.addHeader("Cache-Control", headerValue);
 
@@ -145,8 +145,14 @@ public class MainController implements ServletContextAware {
 					from main.p_dataindex(to_timestamp(:date_start)::timestamp without time zone,to_timestamp(:date_end)::timestamp without time zone);
 				""";
 			MapSqlParameterSource parameters = new MapSqlParameterSource();
-			parameters.addValue("date_start", date_start, Types.INTEGER);
-			parameters.addValue("date_end", date_end, Types.INTEGER);
+			if (date_start!=null)
+				parameters.addValue("date_start", Double.valueOf(date_start), Types.INTEGER);
+			else
+				parameters.addValue("date_start", null, Types.INTEGER);
+			if (date_end!=null)
+				parameters.addValue("date_end", Double.valueOf(date_end), Types.INTEGER);
+			else
+				parameters.addValue("date_end", null, Types.INTEGER);
 			List<String> ret = jdbcTemplate.query(sql, parameters, new DBTools.JsonRowMapper());
 			for (int i = 0; i < ret.size(); i++) {
 				JSONObject rsRez = new JSONObject(ret.get(i));

src/main/resources/logback-spring.xml

@@ -23,7 +23,8 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <!--root level="info"-->
+    <root level="warn">
         <appender-ref ref="FILE" />
         <appender-ref ref="CONSOLE" />
     </root>