X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FDataBase.java;h=7c3cc82c50182e6e2b28de058da017a03c10464d;hb=e8b88c0c8e432f8bc1aefdbd81df81e9ef706242;hp=016a30a41461c8fcfac2374f70a9bdd3f4219820;hpb=a2da61d72212909ad6ededefdc06b04113e380e6;p=proteocache.git

diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java
index 016a30a..7c3cc82 100644
--- a/datadb/compbio/cassandra/DataBase.java
+++ b/datadb/compbio/cassandra/DataBase.java
@@ -4,16 +4,26 @@ 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;
-	private int totalId;
+	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 String id;
-	private String prot;
+	private String ip;
+	private String prot;				// protein sequence
 	private String jpred;
-	private List<String> subProt;
 	private List<Integer> timeRez;
 	private List<Integer> timeTotalExec;
+	private JobBean logInfo;
+	private ProteinBean predictions;
 
 	public DataBase() {
 	}
@@ -28,6 +38,8 @@ public class DataBase {
 	}
 
 	public String getDate() {
+		if (null == date)
+			return "1/1/1970";
 		return date;
 	}
 
@@ -39,6 +51,46 @@ public class DataBase {
 		return total;
 	}
 
+	public void setTotalOK(int tot) {
+		this.totalOK = tot;
+	}
+
+	public int getTotalOK() {
+		return totalOK;
+	}
+
+	public void setTotalStopped(int tot) {
+		this.totalStopped = tot;
+	}
+
+	public int getTotalStopped() {
+		return totalStopped;
+	}
+
+	public void setTotalError(int tot) {
+		this.totalError = tot;
+	}
+
+	public int getTotalError() {
+		return totalError;
+	}
+
+	public void setTotalTimeOut(int tot) {
+		this.totalTimeOut = tot;
+	}
+
+	public int getTotalTimeOut() {
+		return totalTimeOut;
+	}
+	
+	public void setTotalJobs(int totalJobs) {
+		this.totalJobs = totalJobs;
+	}
+
+	public int getTotalJobs() {
+		return totalJobs;
+	}
+
 	public void setTotalId(int totId) {
 		this.totalId = totId;
 	}
@@ -70,13 +122,13 @@ public class DataBase {
 	public String getId() {
 		return id;
 	}
-
-	public void setSubProt(List<String> subProt) {
-		this.subProt = subProt;
+	
+	public void setIp(String ip) {
+		this.ip = ip;
 	}
 
-	public List<String> getSubProt() {
-		return subProt;
+	public String getIp() {
+		return ip;
 	}
 
 	public void setTimeRez(List<Integer> timeRez) {
@@ -94,5 +146,21 @@ public class DataBase {
 	public List<Integer> getTimeTotalExec() {
 		return timeTotalExec;
 	}
+	
+	public void setLogInfo(JobBean logInfo){
+		this.logInfo = logInfo;
+	}
+	
+	public JobBean getLogInfo() {
+		return logInfo;
+	}
+	
+	public void setPredictions(ProteinBean predictions){
+		this.predictions = predictions;
+	}
+	
+	public ProteinBean getPredictions() {
+		return predictions;
+	}
 
 }