X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FDataBase.java;h=57063eca37fe40b859d85ad1710a460fbafc82f1;hb=0e1f92db0e4043bfa93417481274b6461cdb09cd;hp=26a019aed1ffba9864581d9c3caf84523d3d926d;hpb=b154a542bd08371e3bcc7d92d0ded1c638399087;p=proteocache.git

diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java
index 26a019a..57063ec 100644
--- a/datadb/compbio/cassandra/DataBase.java
+++ b/datadb/compbio/cassandra/DataBase.java
@@ -6,10 +6,10 @@ import java.util.Collections;
 
 public class DataBase {
 	private String date;
-	private int total;    				// total number of jobs
-	private int totalOK;			    // number of jobs with execution status OK
-	private int totalStopped;  			 // number of jobs with execution status STOPPED
-	private int totalError;   			// number of jobs with execution status Jpred ERROR
+	private int total;					// total number of jobs
+	private int totalOK;				// number of jobs with execution status OK
+	private int totalStopped;			 // number of jobs with execution status STOPPED
+	private int totalError;				// number of jobs with execution status Jpred ERROR
 	private int totalTimeOut;			// number of jobs with execution status TIMEOUT
 	private int totalJobs;
 	private int totalId;				// total jobs for current protein sequence
@@ -17,11 +17,11 @@ public class DataBase {
 	private String ip;
 	private String prot;				// protein sequence
 	private String jpred;
-	private List<String> subProt;		// protein sequence divided by several parts for highlighting the particular part
 	private List<Integer> timeRez;
 	private List<Integer> timeTotalExec;
-	private StructureJobLog logInfo;
-	private AnnotatedProteinSequenceBean predictions;
+	private JobBean logInfo;
+	private ProteinBean predictions;
+
 	public DataBase() {
 	}
 
@@ -35,6 +35,8 @@ public class DataBase {
 	}
 
 	public String getDate() {
+		if (null == date)
+			return "1/1/1970";
 		return date;
 	}
 
@@ -126,14 +128,6 @@ public class DataBase {
 		return ip;
 	}
 
-	public void setSubProt(List<String> subProt) {
-		this.subProt = subProt;
-	}
-
-	public List<String> getSubProt() {
-		return subProt;
-	}
-
 	public void setTimeRez(List<Integer> timeRez) {
 		this.timeRez = timeRez;
 	}
@@ -150,19 +144,19 @@ public class DataBase {
 		return timeTotalExec;
 	}
 	
-	public void setLogInfo(StructureJobLog logInfo){
+	public void setLogInfo(JobBean logInfo){
 		this.logInfo = logInfo;
 	}
 	
-	public StructureJobLog getLogInfo() {
+	public JobBean getLogInfo() {
 		return logInfo;
 	}
 	
-	public void setPredictions(AnnotatedProteinSequenceBean predictions){
+	public void setPredictions(ProteinBean predictions){
 		this.predictions = predictions;
 	}
 	
-	public AnnotatedProteinSequenceBean getPredictions() {
+	public ProteinBean getPredictions() {
 		return predictions;
 	}