From: Natasha Sherstneva Date: Fri, 22 Nov 2013 11:46:09 +0000 (+0000) Subject: PROT-7 fixed report by dates X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2664ee4e4eb002b7e8cd153b10ac7000c522af24;p=proteocache.git PROT-7 fixed report by dates --- diff --git a/.classpath b/.classpath index 38a76ef..b54f438 100644 --- a/.classpath +++ b/.classpath @@ -19,11 +19,7 @@ - - - - - + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index bad9d4b..2905b91 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,6 +1,5 @@ - diff --git a/server/compbio/listeners/ServletJobsByDate.java b/server/compbio/listeners/ServletJobsByDate.java index 4aee8be..39fdf16 100644 --- a/server/compbio/listeners/ServletJobsByDate.java +++ b/server/compbio/listeners/ServletJobsByDate.java @@ -39,7 +39,7 @@ public class ServletJobsByDate extends HttpServlet { request.setAttribute("result", res); final long endTime = System.currentTimeMillis(); request.setAttribute("timeExecution", (endTime - startTime)); - System.out.println ("QueryServlet.doGet: total number of dates = " + res.size()); +// System.out.println ("QueryServlet.doGet: total number of dates = " + res.size()); request.setAttribute("flag", request.getParameter("option")); RequestDispatcher rd = request.getRequestDispatcher("/ReportJobsByDate.jsp"); rd.forward(request, response); diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java index ad99868..ec74c6f 100755 --- a/server/compbio/statistic/CassandraRequester.java +++ b/server/compbio/statistic/CassandraRequester.java @@ -142,6 +142,8 @@ public class CassandraRequester { query = new ArrayList(); for (Date date = start.getTime(); !start.after(end); start.add(Calendar.DATE, 1), date = start.getTime()) { List res = db.ReadDateTable(date.getTime()); + if (res == null) + continue; DataBase bean = new DataBase(); bean.setTotal((int)(long)res.get(0)); bean.setTotalOK((int)(long)res.get(1)); diff --git a/website/ReportJobsByDate.jsp b/website/ReportJobsByDate.jsp index f583510..f531446 100644 --- a/website/ReportJobsByDate.jsp +++ b/website/ReportJobsByDate.jsp @@ -17,6 +17,12 @@

Time execution: ${timeExecution} ms

+ + + +

No jobs for this period

+
+ @@ -74,4 +80,6 @@ - \ No newline at end of file + + +
\ No newline at end of file