X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=afba67b4304fc042e5bea1b7f1babb2cf1dbcc1c;hb=8a0caa40d0fa288a0ad23f6af2aab1b0de0d50cd;hp=ec74c6f8312944e5fae62a1d848418f1a8368a48;hpb=34b63209df068b7671e40e5b298eb184785c83ac;p=proteocache.git

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index ec74c6f..afba67b 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -21,6 +21,8 @@ public class CassandraRequester {
 	private ArrayList<DataBase> query;
 	private static long currentDate = 0;
 	private static long earlestDate = 0;
+	private final static SimpleDateFormat formatYYMMDD = new SimpleDateFormat("yyyy/MM/dd");
+	private final static SimpleDateFormat formatDDMMYY = new SimpleDateFormat("dd/MM/yyyy");
 
 	/*
 	 * query: execution time for the period from date1 till date2
@@ -32,14 +34,14 @@ public class CassandraRequester {
 		if (null == date2) {
 			date1 = "2100/1/1";
 		}
-		if (!isThisDateValid(date1) || !isThisDateValid(date2)) {
+		if (!isThisDateValid(date1,formatYYMMDD) || !isThisDateValid(date2,formatYYMMDD)) {
 			System.out.println("Wrong date: point 3");
 			return null;
 		}
 		SetDateRange();
 		int nbins = 5;
-		long dateStart = DateParsing(date1);
-		long dateEnd = DateParsing(date2);
+		long dateStart = DateParsing(date1, formatYYMMDD);
+		long dateEnd = DateParsing(date2, formatYYMMDD);
 		if (dateEnd < earlestDate || dateStart > currentDate || dateStart > dateEnd)
 			return null;
 		if (dateStart < earlestDate)
@@ -121,13 +123,13 @@ public class CassandraRequester {
 		if (null == date2) {
 			date1 = "2100/1/1";
 		}
-		if (!isThisDateValid(date1) || !isThisDateValid(date2)) {
+		if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
 			System.out.println("Wrong date: point 3");
 			return null;
 		}
 		SetDateRange();
-		long dateStart = DateParsing(date1);
-		long dateEnd = DateParsing(date2);
+		long dateStart = DateParsing(date1, formatYYMMDD);
+		long dateEnd = DateParsing(date2, formatYYMMDD);
 		if (dateEnd < earlestDate || dateStart > currentDate || dateStart > dateEnd)
 			return null;
 		if (dateStart < earlestDate)
@@ -156,31 +158,62 @@ public class CassandraRequester {
 		System.out.println("StatisticsProt.readLength: total number of dates = " + query.size());
 		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<StructureProteinPrediction> res;
 		if (flag.equals("whole")) 
 			res = db.ReadWholeSequence(protIn);
 		 else 
-			res = db.ReadPartOfSequence(protIn);
+			 res = (protIn.length() > 0) ? db.ReadPartOfSequence(protIn) : null;
 		if (res == null)
 			return null;
 		for (StructureProteinPrediction entry : res) {
-			Map<String,String> pred = entry.getPrediction();
-			Iterator it = pred.entrySet().iterator();
-			while (it.hasNext()) {
-				DataBase db = new DataBase();
-				db.setProt(entry.getSequence());
-				Map.Entry pairs = (Map.Entry)it.next();
-				db.setId(entry.getJobid());
-				db.setJpred(pairs.getValue().toString());
+				DataBase bean = new DataBase();
+				bean.setProt(entry.getSequence());
+				bean.setId(entry.getJobid());
+				bean.setJpred(entry.getJnetpred());
 				if (flag.equals("part"))
-					db.setSubProt(CreateSubprot (entry.getSequence(), protIn));				
-				query.add(db);
-			}
+					bean.setSubProt(CreateSubprot (entry.getSequence(), protIn));				
+				query.add(bean);
+			
 		}
 		return query;
 	}
@@ -206,13 +239,16 @@ public class CassandraRequester {
 	 * query jobs log info
 	 */
 	public DataBase readJobLog(String jobid) {
-	//	query = new ArrayList<DataBase>();
+		if (jobid == null)
+			return null;
 		StructureJobLog res = db.ReadJobLog(jobid);
+		if (res == null)
+			return null;
 		DataBase query = new DataBase();
 		query.setLogInfo(res);
-	//	query.setres);
 		return query;
 	}
+	
 	/*
 	 * create list of parts of protein sequence;
 	 */
@@ -233,12 +269,12 @@ public class CassandraRequester {
 	/*
 	 * convert String date into long date (miliseconds since the epoch start)
 	 */
-	private static long DateParsing(String datInput) {
+	private static long DateParsing(String datInput, SimpleDateFormat formatter) {
 		if (datInput == null) {
 			return 0;
 		}
 		long dateWorkSt = 0;
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
+		
 		try {
 			dateWorkSt = formatter.parse(datInput).getTime();
 		} catch (ParseException e) {
@@ -259,7 +295,7 @@ public class CassandraRequester {
 	 */
 	private static void SetDateRange() {
 		Calendar cal = Calendar.getInstance();
-		currentDate = DateParsing(cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH));
+		currentDate = DateParsing(cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH), formatYYMMDD);
 		if (0 == earlestDate) {
 			CassandraRequester cr = new CassandraRequester();
 			earlestDate = cr.earliestDate();
@@ -267,12 +303,11 @@ public class CassandraRequester {
 		}
 	}
 
-	public boolean isThisDateValid(String dateToValidate) {
+	public boolean isThisDateValid(String dateToValidate, SimpleDateFormat sdf) {
 		if (dateToValidate == null || dateToValidate.equals("")) {
 			System.out.println("Undefined date");
 			return false;
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
 		try {
 			// if not valid, this will throw ParseException
 			sdf.setLenient(false);