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");
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()
+ 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");
}