PROT-4 updated structure ProteinData (change primary key, add column ExecTime), Jpred...

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

diff --git a/datadb/compbio/cassandra/CassandraWriter.java b/datadb/compbio/cassandra/CassandraWriter.java
index 48bbda7..592016e 100644 (file)
--- a/datadb/compbio/cassandra/CassandraWriter.java
+++ b/datadb/compbio/cassandra/CassandraWriter.java
@@ -58,8 +58,8 @@ public class CassandraWriter {
                                        + "','" + execstatus + "','" + protein + "');";
                        session.execute(com1);
 
-                       String com2 = "INSERT INTO ProteinData " + "(jobtime, JobID, Protein)" + " VALUES (" + job.getStartingDate() + ",'" + id
-                                       + "','" + protein + "');";
+                       String com2 = "INSERT INTO ProteinData " + "(jobtime, JobID, ExecTime, Protein)" + " VALUES (" + job.getStartingDate() + ",'" + id
+                                       + "'," + job.getExecutionTime() + ",'" + protein + "');";
                        session.execute(com2);
 
                        String allpredictions = "";
@@ -120,8 +120,8 @@ public class CassandraWriter {
                if (JobisNotArchived(job.getJobID())) {
                        String id = job.getJobID();
                        String log = job.getLog().replaceAll("'", "");
-                       String com = "INSERT INTO JpredArchive (JobID, Protein, IP, StartTime, ExecTime,LOG, ArchiveLink) VALUES ('" + id + "','"
-                                       + job.getProtein() + "','" + job.getIP() + "'," + job.getStartingTime() + "," + job.getExecutionTime() + ",'" + log
+                       String com = "INSERT INTO JpredArchive (JobID, Protein, IP, StartTime, ExecTime, FinalStatus, LOG, ArchiveLink) VALUES ('" + id + "','"
+                                       + job.getProtein() + "','" + job.getIP() + "'," + job.getStartingTime() + "," + job.getExecutionTime() + ",'" + job.getFinalStatus() + "','" + log
                                        + "','" + archivepath + "');";
                        session.execute(com);