Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets

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

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 5ed9398..6a54800 100755 (executable)
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -13,7 +13,6 @@ import compbio.cassandra.DateBean;
 import compbio.cassandra.ProteinBean;
 import compbio.cassandra.CassandraNativeConnector;
 import compbio.cassandra.CassandraReader;
-import compbio.cassandra.DataBase;
 import compbio.cassandra.Pair;
 import compbio.cassandra.JobBean;
 import compbio.cassandra.Total;
@@ -23,7 +22,6 @@ import compbio.cassandra.UserBean;
 
 public class CassandraRequester {
        private CassandraReader db = new CassandraReader();
-       private ArrayList<DataBase> query;
        private static long currentDate = 0;
        private static long earlestDate = 0;
        private final static SimpleDateFormat formatYYMMDD = new SimpleDateFormat("yyyy/MM/dd");
@@ -31,7 +29,7 @@ public class CassandraRequester {
 
        /*
         * query: execution time for the period from date1 till date2
-        */
+        
        public List<DataBase> extractExecutionTime(String date1, String date2) {
                if (null == date1) {
                        date1 = "1970/1/1";
@@ -115,8 +113,9 @@ public class CassandraRequester {
                db.setTimeTotalExec(totalTime);
                query.add(db);
                return query;
-       }
-
+<<<<<<< HEAD
+       }*/
+       
        /*
         * query: total number of jobs for the period from date1 till date2
         */
@@ -300,6 +299,12 @@ public class CassandraRequester {
                SimpleDateFormat datformat = new SimpleDateFormat("dd/MM/yyyy");
                return datformat.format(new Date(inDate));
        }
+       
+       // convert long to date in string format
+               private static String DateFormatYYMMDD(long inDate) {
+                       SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");
+                       return datformat.format(new Date(inDate));
+               }
 
        /*
         * set earlest date and current dates. earlestDate is static and should be
@@ -337,5 +342,13 @@ public class CassandraRequester {
                earlestDate = CassandraNativeConnector.getEarliestDateInDB();
                return earlestDate;
        }
-
+       
+       /*
+        * find the earliest date in the database in String format
+        */
+       public String earliestDateString() {
+               earlestDate = CassandraNativeConnector.getEarliestDateInDB();
+               return DateFormatYYMMDD(earlestDate);
+       }
+       
 }