X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FCassandraReaderOld.java;h=e08b39c569a0b7e7d5e4f397ef8dd471bf0d9f53;hb=5fb4cb600b34a9b33e1a96aae9d66cdd1c3201dc;hp=f29bc9f3b9954f7b135b9615206084684ba5b206;hpb=23ef7a6a36233ee82656f6d0f602b82f009847ed;p=proteocache.git

diff --git a/datadb/compbio/cassandra/CassandraReaderOld.java b/datadb/compbio/cassandra/CassandraReaderOld.java
index f29bc9f..e08b39c 100644
--- a/datadb/compbio/cassandra/CassandraReaderOld.java
+++ b/datadb/compbio/cassandra/CassandraReaderOld.java
@@ -12,6 +12,10 @@ import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.ResultSet;
 
+import compbio.beans.DateBean;
+import compbio.beans.JobBean;
+import compbio.beans.ProteinBean;
+import compbio.beans.Total;
 import compbio.engine.JobStatus;
 
 public class CassandraReaderOld {
@@ -217,7 +221,7 @@ public class CassandraReaderOld {
 		for (Row r : rows) {
 			String prot = r.getString("Protein");
 			String prediction = findJnetpred(r.getMap("Predictions", String.class, String.class));
-			if (prot != null || prediction != null)	
+			if (prot != null || prediction != null)
 				res.put(prot, prediction);
 		}
 		final long endTime = System.currentTimeMillis();
@@ -225,13 +229,14 @@ public class CassandraReaderOld {
 		return res;
 	}
 
-	private String findJnetpred (Map<String,String> pred) {
+	private String findJnetpred(Map<String, String> pred) {
 		if (pred != null) {
-			if (pred.containsKey("jnetpred")) 
+			if (pred.containsKey("jnetpred"))
 				return pred.get("jnetpred");
 		}
 		return null;
 	}
+
 	/*
 	 * getting protein sequences by counter
 	 */
@@ -309,7 +314,8 @@ public class CassandraReaderOld {
 			return null;
 		Row row1 = results1.one();
 		JobBean res = new JobBean(row.getString("Protein"), row.getString("JobID"), row.getString("DataBegin"), row.getString("DataEnd"),
-				row.getString("ip"), row1.getMap("Predictions", String.class, String.class));
+				row.getString("ip"), row1.getMap("Predictions", String.class, String.class), row.getString("ProgramName"),
+				row.getString("ProgramVersion"));
 		System.out.println("Query time is " + (queryTime - startTime) + " msec");
 		final long endTime = System.currentTimeMillis();
 		System.out.println(" rows analysed, execution time is " + (endTime - startTime) + " msec");