import java.util.List;
import org.apache.log4j.Logger;
-import org.springframework.dao.DataIntegrityViolationException;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
String protein = job.getProtein();
String finalstatus = job.getFinalStatus();
String execstatus = job.getExecutionStatus();
+ String ProgramName = job.getProgramName();
+ String ProgramVersion = job.getProgramVersion();
- String com1 = "INSERT INTO ProteinLog (JobID, IP, DataBegin, DataEnd, FinalStatus, ExecutionStatus, Protein) VALUES ('" + id
- + "','" + job.getIP() + "','" + job.getStartingTimeStr() + "','" + job.getEndTimeStr() + "','" + finalstatus + "','"
- + execstatus + "','" + protein + "');";
+ 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");
// requests)
// TODO I don't like the bit of code. There should not be so many
// counters...
- int njobsTotal = 1;
int njobsOk = 0;
int njobsStop = 0;
int njobsError = 0;
}
if (!results4.isExhausted()) {
Row r = results4.one();
- njobsTotal += r.getLong("Total");
njobsOk += r.getLong("TotalOK");
njobsError += r.getLong("TotalError");
njobsStop += r.getLong("TotalStopped");
njobsTimeOut += r.getLong("TotalTimeOut");
}
- String com = "INSERT INTO JobDateInfo " + "(jobday, Total, TotalOK, TotalStopped, TotalError, TotalTimeOut)" + " VALUES ("
- + job.getStartingDate() + "," + njobsTotal + "," + njobsOk + "," + njobsStop + "," + njobsError + "," + njobsTimeOut
- + ");";
+ String com = "INSERT INTO JobDateInfo " + "(jobday, TotalOK, TotalStopped, TotalError, TotalTimeOut)" + " VALUES ("
+ + job.getStartingDate() + "," + njobsOk + "," + njobsStop + "," + njobsError + "," + njobsTimeOut + ");";
if (null == execute(com)) {
System.out.println("CassandraWriter.FormQueryTables: couldn't insert into JobDateInfo");
// return 0;
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, ProgramName, ProgramVersion) VALUES ('"
+ id
+ "','"
+ job.getProtein()
+ job.getStartingTime()
+ ","
+ job.getExecutionTime()
- + ",'" + job.getFinalStatus() + "','" + job.getExecutionStatus() + "','" + log + "','" + archivepath + "');";
+ + ",'"
+ + job.getFinalStatus()
+ + "','"
+ + job.getExecutionStatus()
+ + "','"
+ + log
+ + "','"
+ + archivepath
+ + "','"
+ + job.getProgramName() + "','" + job.getProgramVersion() + "');";
if (null == execute(com)) {
System.out.println("CassandraWriter.ArchiveData: couldn't insert into JpredArchive");
}