Merge branch 'master' into PROT-9-webservice

[proteocache.git] / engine / compbio / engine / Job.java

diff --git a/engine/compbio/engine/Job.java b/engine/compbio/engine/Job.java
index 309e0e9..31309e5 100644 (file)
--- a/engine/compbio/engine/Job.java
+++ b/engine/compbio/engine/Job.java
@@ -10,6 +10,8 @@ public class Job {
        private String FinalStatus;
        private String IP;
        private String Email;
+       private String ProgramName;
+       private String ProgramVersion;
 
        private String StartingDateStr;
        private long StartingDate;
@@ -18,15 +20,18 @@ public class Job {
        private String StartingTimeStr;
        private long StartingTime;
        private long ExecutionTime;
+       
 
-       static SimpleDateFormat dateformatter =  new SimpleDateFormat("yyyy/MM/dd");;
+       static SimpleDateFormat dateformatter = new SimpleDateFormat("yyyy/MM/dd");;
        static SimpleDateFormat timeformatter = new SimpleDateFormat("yyyy/MM/dd:H:m:s");
 
        public Job() {
                ExecutionStatus = "OK";
                FinalStatus = "OK";
                jobid = "";
-               
+               ProgramName ="";
+               ProgramVersion = "";
+
                StartingDateStr = "1970/1/1";
                StartingTimeStr = "1970/1/1:0:0:0";
                EndTimeStr = "1970/1/1:0:0:0";
@@ -43,7 +48,7 @@ public class Job {
                setDates(date1, date2);
        }
 
-       protected void setDates (String d1, String d2) {
+       protected void setDates(String d1, String d2) {
                StartingTimeStr = d1;
                StartingDateStr = d1.substring(0, d1.indexOf(":"));
                StartingTime = convertTime(StartingTimeStr);
@@ -53,9 +58,8 @@ public class Job {
                EndTime = convertTime(d2);
                ExecutionTime = EndTime - StartingTime;
        }
-       
-       
-       protected long convertDate (String d) {
+
+       protected long convertDate(String d) {
                try {
                        if (null != d) {
                                Date startdate = dateformatter.parse(d);
@@ -66,8 +70,8 @@ public class Job {
                }
                return 0L;
        }
-       
-       protected long convertTime (String d) {
+
+       protected long convertTime(String d) {
                try {
                        if (null != d) {
                                Date startdate = timeformatter.parse(d);
@@ -78,8 +82,7 @@ public class Job {
                }
                return 0L;
        }
-       
-       
+
        public void setStartingDate(String date) {
                this.StartingDateStr = date;
                StartingDate = convertDate(date);
@@ -100,12 +103,15 @@ public class Job {
        public String getStartingDateStr() {
                return StartingDateStr;
        }
+
        public String getStartingTimeStr() {
                return StartingTimeStr;
        }
+
        public long getStartingDate() {
                return StartingDate;
        }
+
        public long getStartingTime() {
                return StartingTime;
        }
@@ -113,6 +119,7 @@ public class Job {
        public String getEndTimeStr() {
                return EndTimeStr;
        }
+
        public long getEndTime() {
                return EndTime;
        }
@@ -124,7 +131,7 @@ public class Job {
        public void setFinalStatus(String status) {
                FinalStatus = status;
        }
-       
+
        public String getExecutionStatus() {
                return ExecutionStatus;
        }
@@ -136,7 +143,7 @@ public class Job {
        public long getExecutionTime() {
                return ExecutionTime;
        }
-       
+
        public void setIP(String IP) {
                this.IP = IP;
        }
@@ -146,7 +153,7 @@ public class Job {
                        return IP;
                return "127.0.0.1";
        }
-       
+
        public void setEmail(String email) {
                this.Email = email;
        }
@@ -164,4 +171,20 @@ public class Job {
        public String getJobID() {
                return jobid;
        }
+       
+       public void setProgramName(String prog) {
+               this.ProgramName = prog;
+       }
+
+       public String getProgramName() {
+               return ProgramName;
+       }
+       
+       public void setProgramVersion(String ver) {
+               this.ProgramVersion = ver;
+       }
+
+       public String getProgramVersion() {
+               return ProgramVersion;
+       }
 }