X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FCassandraReaderOld.java;h=ccd13edd66fc49b1023f1bcb28bce81c716cf0a7;hb=58c9b97523e2273a316a947d977ca7ddd8b1356a;hp=6055e607166eddc5e4da1327ac3adc26b306eabd;hpb=e42a6142f6baa1854037e2e869b8f4c1ab6ba000;p=proteocache.git

diff --git a/datadb/compbio/cassandra/CassandraReaderOld.java b/datadb/compbio/cassandra/CassandraReaderOld.java
index 6055e60..ccd13ed 100644
--- a/datadb/compbio/cassandra/CassandraReaderOld.java
+++ b/datadb/compbio/cassandra/CassandraReaderOld.java
@@ -207,27 +207,24 @@ public class CassandraReaderOld {
 	 * getting protein sequence from the db ProteinRow
 	 */
 	public Map<String, String> ReadProtein() {
-		final long startTime = System.currentTimeMillis();
+		//final long startTime = System.currentTimeMillis();
 		String com = "SELECT * FROM ProteinRow;";
 		System.out.println("Command: " + com);
 		ResultSet results = session.execute(com);
 		if (results.isExhausted())
 			return null;
-		final long queryTime = System.currentTimeMillis();
+		//final long queryTime = System.currentTimeMillis();
 		List<Row> rows = results.all();
-		System.out.println("Query time is " + (queryTime - startTime) + " msec");
-		System.out.println(" rows analysed,  " + rows.size());
-		Map<String, String> res = new HashMap<String, String>();
-		int c = 0;
+		Map<String, String> output = new HashMap<String, String>();
 		for (Row r : rows) {
-			String prot = r.getString("Protein");
+			String protein = r.getString("Protein");
 			String prediction = findJnetpred(r.getMap("Predictions", String.class, String.class));
-			if (prot != null || prediction != null)
-				res.put(prot, prediction);
+			if (protein != null && prediction != null) {
+				output.put(protein, prediction);
+			}
 		}
-		final long endTime = System.currentTimeMillis();
-		System.out.println(c + " rows analysed, execution time is " + (endTime - startTime) + " msec");
-		return res;
+		//final long endTime = System.currentTimeMillis();
+		return output;
 	}
 
 	private String findJnetpred(Map<String, String> pred) {