Clean up the code

[proteocache.git] / datadb / compbio / cassandra / DataBase.java

diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java
index c661e77..6ced180 100644 (file)
--- a/datadb/compbio/cassandra/DataBase.java
+++ b/datadb/compbio/cassandra/DataBase.java
@@ -2,15 +2,26 @@ package compbio.cassandra;
 
 import java.util.List;
 
+import compbio.beans.JobBean;
+import compbio.beans.ProteinBean;
+
 public class DataBase {
-       String date;
-       int total;
-       int totalId;
-       String id;
-       String prot;
-       String jpred;
-       List<String> subProt;
-       List<Integer> timeRez;
+       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 totalJobs;
+       private int totalId; // total jobs for current protein sequence
+       private String id;
+       private String ip;
+       private String prot; // protein sequence
+       private String jpred;
+       private List<Integer> timeRez;
+       private List<Integer> timeTotalExec;
+       private JobBean logInfo;
+       private ProteinBean predictions;
 
        public DataBase() {
        }
@@ -25,6 +36,8 @@ public class DataBase {
        }
 
        public String getDate() {
+               if (null == date)
+                       return "1/1/1970";
                return date;
        }
 
@@ -36,6 +49,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;
        }
@@ -68,12 +121,12 @@ public class DataBase {
                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) {
@@ -84,4 +137,28 @@ public class DataBase {
                return timeRez;
        }
 
+       public void setTimeTotalExec(List<Integer> timeTotalExec) {
+               this.timeTotalExec = timeTotalExec;
+       }
+
+       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;
+       }
+
 }