X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=6a548006eaa1493aafcf917e4776d171b280f62b;hb=6e4bd47e22036a7f0c7b66fe7ee4f188a7cffddb;hp=5de50661fd139118b7c443a32a78ef90494062f2;hpb=027e5ff55587cf7e8295066f9e43d56c180354f6;p=proteocache.git

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index 5de5066..6a54800 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -37,7 +37,7 @@ public class CassandraRequester {
 		if (null == date2) {
 			date1 = "2100/1/1";
 		}
-		if (!isThisDateValid(date1,formatYYMMDD) || !isThisDateValid(date2,formatYYMMDD)) {
+		if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
 			System.out.println("CassandraRequester.extractExecutionTime: wrong format for date1 " + date1 + "or date2 " + date2);
 			return null;
 		}
@@ -113,10 +113,11 @@ public class CassandraRequester {
 		db.setTimeTotalExec(totalTime);
 		query.add(db);
 		return query;
+<<<<<<< HEAD
 	}*/
 	
 	/*
-	 * query: total number of jobs  for the period from date1 till date2
+	 * query: total number of jobs for the period from date1 till date2
 	 */
 	public TotalJobsStatisticBean countJobs(String date1, String date2) {
 		if (null == date1) {
@@ -144,7 +145,7 @@ public class CassandraRequester {
 		Calendar end = Calendar.getInstance();
 		end.setTime(new Date(dateEnd));
 		TotalJobsStatisticBean query = new TotalJobsStatisticBean();
-		Total wholeTotal = new Total(0,0,0,0,0);
+		Total wholeTotal = new Total(0, 0, 0, 0, 0);
 		for (Date date = start.getTime(); !start.after(end); start.add(Calendar.DATE, 1), date = start.getTime()) {
 			Total res = db.ReadDateTable(date.getTime());
 			if (res == null)
@@ -163,7 +164,7 @@ public class CassandraRequester {
 	/*
 	 * query: jobs and sequence at date
 	 */
-	public DateBean readJobByDay (String date) {
+	public DateBean readJobByDay(String date) {
 		if (!isThisDateValid(date, formatDDMMYY)) {
 			System.out.println("CassandraRequester.readJobByDay: Wrong date format for " + date);
 			return null;
@@ -171,36 +172,34 @@ public class CassandraRequester {
 		SetDateRange();
 		long day = DateParsing(date, formatDDMMYY);
 		if (day < earlestDate || day > currentDate)
-			return null;	
+			return null;
 		return db.ReadProteinData(day, date);
 	}
 
-
-	/* 
+	/*
 	 * query: protein sequence
-	 **/
+	 */
 	public List<ProteinBean> readProteins(String protIn, String flag) {
 		List<ProteinBean> result;
-		if (flag.equals("whole")) 
+		if (flag.equals("whole"))
 			result = db.ReadWholeSequence(protIn);
-		 else 
-			 result = db.ReadPartOfSequence(protIn);
+		else
+			result = db.ReadPartOfSequence(protIn);
 		if (result == null)
 			return null;
-		
+
 		if (flag.equals("part")) {
 			for (ProteinBean entry : result) {
 				entry.setSubProt(CreateSubprot(entry.getSequence(), protIn));
 			}
-		}					
+		}
 		return result;
 	}
-	
 
-	/* 
+	/*
 	 * query protein sequences with number of jobs
 	 */
-	public List<TotalByCounterBean> readProteinByCounter(int minimalcounter) {		
+	public List<TotalByCounterBean> readProteinByCounter(int minimalcounter) {
 		List<TotalByCounterBean> query = new ArrayList<TotalByCounterBean>();
 		Map<String, Integer> map = db.ReadProteinSequenceByCounter();
 		if (map == null)
@@ -215,8 +214,8 @@ public class CassandraRequester {
 		}
 		return query;
 	}
-	
-	/* 
+
+	/*
 	 * query ip with number of jobs
 	 */
 	public List<TotalByCounterBean> readIpByCounter(Integer minimalcounter) {
@@ -236,6 +235,7 @@ public class CassandraRequester {
 		}
 		return query;
 	}
+
 	/*
 	 * query jobs log info
 	 */
@@ -244,8 +244,7 @@ public class CassandraRequester {
 			return null;
 		return db.ReadJobLog(jobid);
 	}
-	
-	
+
 	/*
 	 * query jobs by ipStructureJobLog
 	 */
@@ -253,17 +252,17 @@ public class CassandraRequester {
 		if (ip == null)
 			return null;
 		Map<String, String[]> res = db.ReadIpWithJobs(ip);
-		if (res == null) 
+		if (res == null)
 			return null;
 		UserBean query = new UserBean(ip);
 		query.setMainInfo(res);
 		return query;
 	}
-	
+
 	/*
 	 * create list of parts of protein sequence;
 	 */
-	private static List<String> CreateSubprot (String protein, String subprot) {
+	private static List<String> CreateSubprot(String protein, String subprot) {
 		List<String> sub = new ArrayList<String>();
 		String subStr = protein;
 		while (subStr.length() > 0 && subStr.contains(subprot)) {
@@ -277,6 +276,7 @@ public class CassandraRequester {
 			sub.add(subStr);
 		return sub;
 	}
+
 	/*
 	 * convert String date into long date (miliseconds since the epoch start)
 	 */
@@ -285,7 +285,7 @@ public class CassandraRequester {
 			return 0;
 		}
 		long dateWorkSt = 0;
-		
+
 		try {
 			dateWorkSt = formatter.parse(datInput).getTime();
 		} catch (ParseException e) {
@@ -312,7 +312,8 @@ 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), formatYYMMDD);
+		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();