X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=72ec074fb0beb7ae7115831c138d4382ff5fac8f;hb=4458e44cf92e699159ee1257b1bea6300a9abebe;hp=410a722e6feff04bdc9dbd423bcbe06871470e1b;hpb=92420f700bca908529b5dc0e0e998dd2a7f98bc2;p=proteocache.git

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 410a722..72ec074 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -159,19 +159,49 @@ public class CassandraRequester {
 		return query;
 	}
 
+	/*
+	 * query: jobs and sequence at date
+	 */
+	public List<DataBase> readJobByDay (String date) {
+		System.out.println(date);
+		if (null == date) {
+			return null;
+		}
+		if (!isThisDateValid(date, formatDDMMYY)) {
+			System.out.println("Wrong date: point 3");
+			return null;
+		}
+		SetDateRange();
+		long day = DateParsing(date, formatDDMMYY);
+		System.out.println(day);
+		if (day < earlestDate || day > currentDate)
+			return null;	
+		List<Pair<String, String>>	res = db.ReadProteinData(day);
+		if (res == null)
+			return null;
+		query = new ArrayList<DataBase>();
+		for (Pair<String, String> entry : res) {		
+			DataBase bean = new DataBase();
+			bean.setDate(date);
+			bean.setId(entry.getElement0());
+			bean.setProt(entry.getElement1());
+			query.add(bean);
+		}
+		System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
+		return query;
+	}
+
+
 	/* 
 	 * query: protein sequence
 	 * */
 	public List<DataBase> readProteins(String protIn, String flag) {
-		if (protIn == null)
-			return null;
-		System.out.println(protIn.length());
 		query = new ArrayList<DataBase>();
 		List<AnnotatedProteinSequenceBean> res;
 		if (flag.equals("whole")) 
 			res = db.ReadWholeSequence(protIn);
 		 else 
-			 res = (protIn.length() > 0) ? db.ReadPartOfSequence(protIn) : null;
+			res = db.ReadPartOfSequence(protIn);
 		if (res == null)
 			return null;
 		for (AnnotatedProteinSequenceBean entry : res) {
@@ -186,6 +216,7 @@ public class CassandraRequester {
 		}
 		return query;
 	}
+	
 
 	/* 
 	 * query protein sequences with number of jobs