X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FDataBase.java;h=6ced1804879a8060c35f81b6b546ede499ac1cd5;hb=75431c815ea42cf3ffa18f485721146636575265;hp=26a019aed1ffba9864581d9c3caf84523d3d926d;hpb=16c02499a4eadc9d54c88bdb4402403823a86bd2;p=proteocache.git

diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java
index 26a019a..6ced180 100644
--- a/datadb/compbio/cassandra/DataBase.java
+++ b/datadb/compbio/cassandra/DataBase.java
@@ -1,27 +1,28 @@
 package compbio.cassandra;
 
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
+
+import compbio.beans.JobBean;
+import compbio.beans.ProteinBean;
 
 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 totalTimeOut;			// number of jobs with execution status TIMEOUT
+	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
+	private int totalId; // total jobs for current protein sequence
 	private String id;
 	private String ip;
-	private String prot;				// protein sequence
+	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 +36,8 @@ public class DataBase {
 	}
 
 	public String getDate() {
+		if (null == date)
+			return "1/1/1970";
 		return date;
 	}
 
@@ -77,7 +80,7 @@ public class DataBase {
 	public int getTotalTimeOut() {
 		return totalTimeOut;
 	}
-	
+
 	public void setTotalJobs(int totalJobs) {
 		this.totalJobs = totalJobs;
 	}
@@ -117,7 +120,7 @@ public class DataBase {
 	public String getId() {
 		return id;
 	}
-	
+
 	public void setIp(String ip) {
 		this.ip = ip;
 	}
@@ -126,14 +129,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;
 	}
@@ -141,7 +136,7 @@ public class DataBase {
 	public List<Integer> getTimeRez() {
 		return timeRez;
 	}
-	
+
 	public void setTimeTotalExec(List<Integer> timeTotalExec) {
 		this.timeTotalExec = timeTotalExec;
 	}
@@ -149,20 +144,20 @@ public class DataBase {
 	public List<Integer> getTimeTotalExec() {
 		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;
 	}