PROT-4 updated CF JobDateInfo (add new columns), JpredArchive (add column ExecutionSt...

[proteocache.git] / server / compbio / statistic / CassandraRequester.java

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 2da38e7..20ffe0e 100755 (executable)
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -141,11 +141,15 @@ public class CassandraRequester {
                end.setTime(new Date(dateEnd));
                query = new ArrayList<DataBase>();
                for (Date date = start.getTime(); !start.after(end); start.add(Calendar.DATE, 1), date = start.getTime()) {
-                       long res = db.ReadDateTable(date.getTime());
-                       DataBase db = new DataBase();
-                       db.setTotal((int)res);
-                       db.setDate(DateFormat(date.getTime()));
-                       query.add(db);
+                       List<Long> res = db.ReadDateTable(date.getTime());
+                       DataBase bean = new DataBase();
+                       bean.setTotal((int)(long)res.get(0));
+                       bean.setTotalOK((int)(long)res.get(1));
+                       bean.setTotalStopped((int)(long)res.get(2));
+                       bean.setTotalError((int)(long)res.get(3));
+                       bean.setTotalTimeOut((int)(long)res.get(4));
+                       bean.setDate(DateFormat(date.getTime()));
+                       query.add(bean);
                }
                System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
                return query;
@@ -184,11 +188,11 @@ public class CassandraRequester {
                query = new ArrayList<DataBase>();
                Map<String, Integer> map = db.ReadProteinSequenceByCounter();
                for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                       if (entry.getValue() > minimalcounter) {
-                               DataBase db = new DataBase();
-                               db.setTotalId(entry.getValue());
-                               db.setProt(entry.getKey());
-                               query.add(db);
+                       if (entry.getValue() > minimalcounter && entry.getKey().length() > 0) {
+                               DataBase bean = new DataBase();
+                               bean.setTotalId(entry.getValue());
+                               bean.setProt(entry.getKey());
+                               query.add(bean);
                        }
                }
                return query;