Improve stability of Cassandra API calls (commands are checked)

[proteocache.git] / datadb / compbio / cassandra / CassandraReaderOld.java

diff --git a/datadb/compbio/cassandra/CassandraReaderOld.java b/datadb/compbio/cassandra/CassandraReaderOld.java
index e08b39c..6055e60 100644 (file)
--- a/datadb/compbio/cassandra/CassandraReaderOld.java
+++ b/datadb/compbio/cassandra/CassandraReaderOld.java
@@ -17,6 +17,7 @@ import compbio.beans.JobBean;
 import compbio.beans.ProteinBean;
 import compbio.beans.Total;
 import compbio.engine.JobStatus;
+import compbio.engine.Pair;
 
 public class CassandraReaderOld {
        private Session session;
@@ -255,7 +256,6 @@ public class CassandraReaderOld {
                int c = 0;
                for (Row r : rows) {
                        String protein = r.getString("Protein");
-                       String id = r.getString("JobID");
                        if (res.containsKey(protein))
                                res.put(protein, res.get(protein) + 1);
                        else
@@ -284,7 +284,6 @@ public class CassandraReaderOld {
                int c = 0;
                for (Row r : rows) {
                        String ip = r.getString("ip");
-                       String id = r.getString("JobID");
                        if (res.containsKey(ip))
                                res.put(ip, res.get(ip) + 1);
                        else
@@ -314,8 +313,13 @@ 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("ProgramName"),
-                               row.getString("ProgramVersion"));
+                               row.getString("ip"), row1.getMap("Predictions", String.class, String.class));
+               String program = row.getString("ProgramName");
+               String version = row.getString("ProgramVersion");
+               if (null != program && null != version) {
+                       res.setProgramName(program);
+                       res.setProgramVersion(version);
+               }
                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");