Add posibility to look at failed jobs

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

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 5ed9398..e95291a 100755 (executable)
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -5,7 +5,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -20,6 +19,7 @@ import compbio.cassandra.Total;
 import compbio.cassandra.TotalByCounterBean;
 import compbio.cassandra.TotalJobsStatisticBean;
 import compbio.cassandra.UserBean;
+import compbio.engine.JobStatus;
 
 public class CassandraRequester {
        private CassandraReader db = new CassandraReader();
@@ -165,7 +165,7 @@ public class CassandraRequester {
        /*
         * query: jobs and sequence at date
         */
-       public DateBean readJobByDay(String date) {
+       public DateBean readJobByDay(String date, JobStatus status) {
                if (!isThisDateValid(date, formatDDMMYY)) {
                        System.out.println("CassandraRequester.readJobByDay: Wrong date format for " + date);
                        return null;
@@ -174,7 +174,11 @@ public class CassandraRequester {
                long day = DateParsing(date, formatDDMMYY);
                if (day < earlestDate || day > currentDate)
                        return null;
-               return db.ReadProteinData(day, date);
+               
+               if (status == JobStatus.OK) {
+                       return db.ReadProteinData(day, date);
+               }
+               return db.ReadFailedJobs(day, date, status);
        }
 
        /*