X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FJobController.java;h=a2b952cd92be0ea0a3c040631e7ff7e90a5b8d66;hb=daa7e16fa1815c285bf465b69c8aa1a4ae36c0b9;hp=640dd2910ff9f87c9d407beae776e60da7e7c988;hpb=00e522e98b3a55bb0ee05438c20c0f6f30bd411a;p=proteocache.git

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index 640dd29..a2b952c 100644
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -1,6 +1,6 @@
 package compbio.controllers;
 
-import java.security.Principal;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -14,14 +14,27 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import compbio.statistic.CassandraRequester;
 import compbio.cassandra.DataBase;
+import compbio.engine.archive.ArchivedJob;
 
 /**
  * @author Alexander Sherstnev
  * @author Natasha Sherstneva
+ * @version 1.0 Dec 2013
  */
 @Controller
 public class JobController extends BasicController {
 
+	/**
+	 * 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.
+	 * 
+	 * @param model
+	 *            MVC model
+	 * @return link to the JSP query page
+	 */
 	@RequestMapping(value = "/stat/exectime/query", method = RequestMethod.GET)
 	public String initFormExecTime(Map<String, Object> model) {
 		model.put("username", getPrincipalName());
@@ -35,6 +48,13 @@ public class JobController extends BasicController {
 		return "query/JobTimeExecution";
 	}
 
+	/**
+	 * 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/query", method = RequestMethod.GET)
 	public String initFindForm(Map<String, Object> model) {
 		model.put("username", getPrincipalName());
@@ -74,9 +94,16 @@ public class JobController extends BasicController {
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		model.put("IdJob", jobid);
+
+		ArchivedJob aj = new ArchivedJob(jobid);
+		try {
+			model.put("jobarchive", aj.prepareJobArchiveToWeb());
+		} catch (IOException e) {
+			//TODO. what should we do if job is not available???
+		}
 		return "reportJobLog";
 	}
-	
+
 	/*
 	 * convert ???
 	 */
@@ -85,5 +112,5 @@ public class JobController extends BasicController {
 		String dateString = datformat.format(new Date(indate));
 		return dateString;
 	}
-	
+
 }