X-Git-Url: http://source.jalview.org/gitweb/?p=proteocache.git;a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;fp=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=3e5db8a354f46858bdaab803df8c7f51a4942e37;hp=f2336e7883aac39412eed2150579fd8b65bb4829;hb=632abfabd69d9a937d667e263da8df5a1f705d4d;hpb=6e642e37482f7f84dfb2dc21719f79ca5f8a8826

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index f2336e7..3e5db8a 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import compbio.cassandra.DateBean;
 import compbio.cassandra.ProteinBean;
 import compbio.cassandra.CassandraNativeConnector;
-import compbio.cassandra.CassandraReader;
+import compbio.cassandra.CassandraReaderOld;
 import compbio.cassandra.DataBase;
 import compbio.cassandra.Pair;
 import compbio.cassandra.JobBean;
@@ -23,7 +23,7 @@ import compbio.cassandra.UserBean;
 import compbio.engine.JobStatus;
 
 public class CassandraRequester {
-	private CassandraReader db = new CassandraReader();
+	private CassandraReaderOld db = new CassandraReaderOld();
 	private ArrayList<DataBase> query;
 	private static long currentDate = 0;
 	private static long earlestDate = 0;
@@ -122,7 +122,7 @@ public class CassandraRequester {
 	 * query: total number of jobs for the period from date1 till date2
 	 */
 	public TotalJobsStatisticBean countJobs(String date1, String date2) {
-		if (null == date1) {
+	/*	if (null == date1) {
 			date1 = "1970/1/1";
 		}
 		if (null == date2) {
@@ -131,17 +131,16 @@ public class CassandraRequester {
 		if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
 			System.out.println("CassandraRequester.countJobs: wrong format for date1 " + date1 + "or date2 " + date2);
 			return null;
-		}
+		}*/
 		SetDateRange();
 		long dateStart = DateParsing(date1, formatYYMMDD);
 		long dateEnd = DateParsing(date2, formatYYMMDD);
-		if (dateEnd < earlestDate || dateStart > currentDate || dateStart > dateEnd)
+/*		if (dateEnd < earlestDate || dateStart > currentDate || dateStart > dateEnd)
 			return null;
 		if (dateStart < earlestDate)
 			dateStart = earlestDate;
 		if (dateEnd > currentDate)
-			dateStart = currentDate;
-
+			dateStart = currentDate;*/
 		Calendar start = Calendar.getInstance();
 		start.setTime(new Date(dateStart));
 		Calendar end = Calendar.getInstance();