Centralize initial examples of job id and IP

[proteocache.git] / server / compbio / controllers / JobController.java

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index a2b952c..4819e75 100644 (file)
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -7,12 +7,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import compbio.statistic.CassandraRequester;
+import compbio.cassandra.CassandraNativeConnector;
 import compbio.cassandra.DataBase;
 import compbio.engine.archive.ArchivedJob;
 
@@ -23,11 +25,12 @@ import compbio.engine.archive.ArchivedJob;
  */
 @Controller
 public class JobController extends BasicController {
+       private static Logger log = Logger.getLogger(JobController.class);
 
        /**
-        * form a query page for job execution time statistics. The servlet should be
-        * available for users and admins only. By defaults the report time range is
-        * from the earliest day with jobs to today ("Query for all dates" is
+        * form a query page for job execution time statistics. The servlet should
+        * be available for users and admins only. By defaults the report time range
+        * is from the earliest day with jobs to today ("Query for all dates" is
         * ticked). If the user removes the tick the time range is from today - 3
         * days to today. Currently, the input model is empty.
         * 
@@ -49,7 +52,8 @@ public class JobController extends BasicController {
        }
 
        /**
-        * form a query page for a job. The servlet should no be visible to users at all. 
+        * form a query page for a job. The servlet should no be visible to users at
+        * all.
         * 
         * @param model
         *            MVC model
@@ -58,10 +62,18 @@ public class JobController extends BasicController {
        @RequestMapping(value = "/job/query", method = RequestMethod.GET)
        public String initFindForm(Map<String, Object> model) {
                model.put("username", getPrincipalName());
-               model.put("value", "jp_NzBOJKo");
+               CassandraRequester cr = new CassandraRequester();
+               model.put("value", cr.getExample("jobid"));
                return "query/JobLog";
        }
 
+       /**
+        * form a report page for a job execution time statistics.
+        * 
+        * @param model
+        *            MVC model
+        * @return link to the JSP query page
+        */
        @RequestMapping(value = "/stat/exectime/results", method = RequestMethod.GET)
        public String findExecTimeData(@RequestParam("date1") String date1, @RequestParam("date2") String date2,
                        @RequestParam(value = "option", required = false) String option, Map<String, Object> model) {
@@ -85,6 +97,14 @@ public class JobController extends BasicController {
                return "/reportTimeExecution";
        }
 
+       /**
+        * form a query page for a job. The servlet should no be visible to users at
+        * all.
+        * 
+        * @param model
+        *            MVC model
+        * @return link to the JSP query page
+        */
        @RequestMapping(value = "/job/results", method = RequestMethod.GET)
        public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model) {
                model.put("username", getPrincipalName());
@@ -99,13 +119,20 @@ public class JobController extends BasicController {
                try {
                        model.put("jobarchive", aj.prepareJobArchiveToWeb());
                } catch (IOException e) {
-                       //TODO. what should we do if job is not available???
+                       log.error("JobController.prepareJobArchiveToWeb: IO exception with job archive file");
+                       log.error(e.getLocalizedMessage(), e.getCause());
                }
                return "reportJobLog";
        }
 
-       /*
-        * convert ???
+       /**
+        * convert date from the standard long representation (milliseconds from 1
+        * Jan 1970) to yyyy/mm/dd
+        * 
+        * @param indate
+        *            date in milliseconds from 1 Jan 1970
+        * @return date 
+        *            in the form of yyyy/mm/dd
         */
        private String DateFormatYYMMDD(long indate) {
                SimpleDateFormat datformat = new SimpleDateFormat("yyyy/MM/dd");