X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fstatistic%2FCassandraRequester.java;h=ca598440d03bad51dc9f83d328a285c63e4a4bc2;hb=6823d2f36ff55b7ab11d674e3fe4d04dc57d6bbf;hp=f2336e7883aac39412eed2150579fd8b65bb4829;hpb=c15dbff6d660ba14d41407bebeceda4414f45068;p=proteocache.git

diff --git a/server/compbio/statistic/CassandraRequester.java b/server/compbio/statistic/CassandraRequester.java
index f2336e7..ca59844 100755
--- a/server/compbio/statistic/CassandraRequester.java
+++ b/server/compbio/statistic/CassandraRequester.java
@@ -9,21 +9,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import compbio.cassandra.DateBean;
-import compbio.cassandra.ProteinBean;
+import compbio.beans.DateBean;
+import compbio.beans.JobBean;
+import compbio.beans.ProteinBean;
+import compbio.beans.Total;
+import compbio.beans.TotalByCounterBean;
+import compbio.beans.TotalJobsStatisticBean;
+import compbio.beans.UserBean;
 import compbio.cassandra.CassandraNativeConnector;
-import compbio.cassandra.CassandraReader;
+import compbio.cassandra.CassandraReaderOld;
 import compbio.cassandra.DataBase;
 import compbio.cassandra.Pair;
-import compbio.cassandra.JobBean;
-import compbio.cassandra.Total;
-import compbio.cassandra.TotalByCounterBean;
-import compbio.cassandra.TotalJobsStatisticBean;
-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;
@@ -112,36 +112,33 @@ public class CassandraRequester {
 			query.add(db);
 		}
 
+		/* ???? Very strange code...
 		DataBase db = new DataBase();
 		db.setTimeTotalExec(totalTime);
 		query.add(db);
+		*/
 		return query;
 	}
 
 	/*
 	 * query: total number of jobs for the period from date1 till date2
-	 */
+	*/ 
 	public TotalJobsStatisticBean countJobs(String date1, String date2) {
-		if (null == date1) {
-			date1 = "1970/1/1";
-		}
-		if (null == date2) {
-			date1 = "2100/1/1";
-		}
-		if (!isThisDateValid(date1, formatYYMMDD) || !isThisDateValid(date2, formatYYMMDD)) {
-			System.out.println("CassandraRequester.countJobs: wrong format for date1 " + date1 + "or date2 " + date2);
-			return null;
-		}
+		/*
+		 * if (null == date1) { date1 = "1970/1/1"; } if (null == date2) { date1
+		 * = "2100/1/1"; } 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)
-			return null;
-		if (dateStart < earlestDate)
-			dateStart = earlestDate;
-		if (dateEnd > currentDate)
-			dateStart = currentDate;
-
+		/*
+		 * if (dateEnd < earlestDate || dateStart > currentDate || dateStart >
+		 * dateEnd) return null; if (dateStart < earlestDate) dateStart =
+		 * earlestDate; if (dateEnd > currentDate) dateStart = currentDate;
+		 */
 		Calendar start = Calendar.getInstance();
 		start.setTime(new Date(dateStart));
 		Calendar end = Calendar.getInstance();
@@ -175,7 +172,7 @@ public class CassandraRequester {
 		long day = DateParsing(date, formatDDMMYY);
 		if (day < earlestDate || day > currentDate)
 			return null;
-		
+
 		if (status == JobStatus.OK) {
 			return db.ReadProteinData(day, date);
 		}
@@ -201,21 +198,22 @@ public class CassandraRequester {
 		}
 		return result;
 	}
-	
+
 	/*
 	 * query: protein feature
 	 */
 	public Map<String, String> readProteinsPrediction(String feature, int percent) {
-		Map<String, String> result = db.ReadProtein();;
+		Map<String, String> result = db.ReadProtein();
+		;
 		if (result == null)
 			return null;
 		Map<String, String> query = new HashMap<String, String>();
 		for (Map.Entry<String, String> entry : result.entrySet()) {
-			String pred = entry.getValue();			
-			if (pred.replaceAll("[^"+feature+"]", "").length() > pred.length() * percent / 100 && (!entry.getKey().equals(""))) {
-			//	if (!entry.getKey().equals(""))
-					query.put(entry.getKey(), pred);
-			}	
+			String pred = entry.getValue();
+			if (pred.replaceAll("[^" + feature + "]", "").length() > pred.length() * percent / 100 && (!entry.getKey().equals(""))) {
+				// if (!entry.getKey().equals(""))
+				query.put(entry.getKey(), pred);
+			}
 		}
 		return query;
 	}
@@ -361,4 +359,22 @@ public class CassandraRequester {
 		return earlestDate;
 	}
 
+	/**
+	 * prepares an example of either job id or IP for the DB
+	 * 
+	 * @param exampletype
+	 *            defines which example you need (an existing job from the DB -
+	 *            jobid, an IP - "ip")
+	 * @return a string representation of the requested example, if the example
+	 *         type is not known empty string is returned
+	 */
+	public String getExample(String exampletype) {
+		if (exampletype.equals("jobid")) {
+			return "jp_NzBOJKo";
+		} else if (exampletype.equals("ip")) {
+			return "127.0.0.1";
+		}
+		return "";
+	}
+
 }