X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=datadb%2Fcompbio%2Fcassandra%2FCassandraWriter.java;h=05a03f0ff7aad6085224f64768acf3cb8415b1b9;hb=db09514e58b52d44ef52d7c4591924a762c99c4b;hp=710d78bf88f74925268732abedbe9a4a65a42330;hpb=82891800716fc8a60071c563d7eb7e694c3c01db;p=proteocache.git

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