Remove old test from web site to replace with most recent

[jabaws.git] / webservices / compbio / stat / servlet / AnnualStat.java

diff --git a/webservices/compbio/stat/servlet/AnnualStat.java b/webservices/compbio/stat/servlet/AnnualStat.java
index b54af52..cc3db41 100644 (file)
--- a/webservices/compbio/stat/servlet/AnnualStat.java
+++ b/webservices/compbio/stat/servlet/AnnualStat.java
@@ -1,6 +1,7 @@
 package compbio.stat.servlet;\r
 \r
 import java.io.IOException;\r
+import java.io.PrintWriter;\r
 import java.sql.SQLException;\r
 import java.util.Date;\r
 import java.util.Map;\r
@@ -24,10 +25,16 @@ public class AnnualStat extends HttpServlet {
                try {\r
                        StatDB db = new StatDB();\r
                        Date earliestRec = db.getEarliestRecord();\r
-                       Map<Date, StatCollection> stats = StatCollection\r
-                                       .getStats(earliestRec);\r
+                       if (earliestRec == null) {\r
+                               PrintWriter writer = resp.getWriter();\r
+                               writer.println("No statistics found in the database. Please allow "\r
+                                               + "at least one hour after a server start for the statistics "\r
+                                               + "collector to collect the data. ");\r
+                               writer.close();\r
+                               return;\r
+                       }\r
                        Map<Date, Totals> monthlyTotals = StatCollection\r
-                                       .getTotalStats(stats);\r
+                                       .getStats(earliestRec);\r
                        req.setAttribute("stat", monthlyTotals);\r
                        req.setAttribute("total", Totals.sumOfTotals(monthlyTotals));\r
 \r
@@ -36,8 +43,8 @@ public class AnnualStat extends HttpServlet {
                        dispatcher.forward(req, resp);\r
 \r
                } catch (SQLException e) {\r
-                       // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
+                       throw new ServletException(e);\r
                }\r
        }\r
 \r