Fix problem with new table column names: ProgrammeName -> ProgramName, Version -...

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

diff --git a/datadb/compbio/cassandra/CassandraWriter.java b/datadb/compbio/cassandra/CassandraWriter.java
index 05a03f0..b12f59e 100644 (file)
--- a/datadb/compbio/cassandra/CassandraWriter.java
+++ b/datadb/compbio/cassandra/CassandraWriter.java
@@ -74,12 +74,20 @@ public class CassandraWriter {
                        String protein = job.getProtein();
                        String finalstatus = job.getFinalStatus();
                        String execstatus = job.getExecutionStatus();
-                       String programmeName = job.getProgrammeName();
-                       String version = job.getVersion();
+                       String ProgramName = job.getProgramName();
+                       String ProgramVersion = job.getProgramVersion();
 
-                       String com1 = "INSERT INTO ProteinLog (JobID, IP, DataBegin, DataEnd, FinalStatus, ExecutionStatus, Protein, ProgrammeName, Version) VALUES ('" + id
-                                       + "','" + job.getIP() + "','" + job.getStartingTimeStr() + "','" + job.getEndTimeStr() + "','" + finalstatus + "','"
-                                       + execstatus + "','" + protein + "','" + programmeName + "','" + version + "');";
+                       String com1 = "INSERT INTO ProteinLog (JobID, IP, DataBegin, DataEnd, FinalStatus, ExecutionStatus, Protein, ProgramName, ProgramVersion) VALUES ('"
+                                       + id
+                                       + "','"
+                                       + job.getIP()
+                                       + "','"
+                                       + job.getStartingTimeStr()
+                                       + "','"
+                                       + job.getEndTimeStr()
+                                       + "','"
+                                       + finalstatus
+                                       + "','" + execstatus + "','" + protein + "','" + ProgramName + "','" + ProgramVersion + "');";
                        ResultSet insert = execute(com1);
                        if (null == insert) {
                                System.out.println("CassandraWriter.FormQueryTables: couldn't insert into ProteinLog");
@@ -193,7 +201,7 @@ 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, FinalStatus, ExecutionStatus, LOG, ArchiveLink, ProgrammeName, Version) VALUES ('"
+                       String com = "INSERT INTO JpredArchive (JobID, Protein, IP, StartTime, ExecTime, FinalStatus, ExecutionStatus, LOG, ArchiveLink, ProgramName, ProgramVersion) VALUES ('"
                                        + id
                                        + "','"
                                        + job.getProtein()
@@ -203,7 +211,16 @@ public class CassandraWriter {
                                        + job.getStartingTime()
                                        + ","
                                        + job.getExecutionTime()
-                                       + ",'" + job.getFinalStatus() + "','" + job.getExecutionStatus() + "','" + log + "','" + archivepath + "','" + job.getProgrammeName() + "','" + job.getVersion() + "');";
+                                       + ",'"
+                                       + job.getFinalStatus()
+                                       + "','"
+                                       + job.getExecutionStatus()
+                                       + "','"
+                                       + log
+                                       + "','"
+                                       + archivepath
+                                       + "','"
+                                       + job.getProgramName() + "','" + job.getProgramVersion() + "');";
                        if (null == execute(com)) {
                                System.out.println("CassandraWriter.ArchiveData: couldn't insert into JpredArchive");
                        }