X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FJobLogController.java;fp=server%2Fcompbio%2Fcontrollers%2FJobLogController.java;h=28d6961d8291409911ebf0938d2bbca6d83f631f;hb=6b59d49dbcca1616d74c2814d87faf47e3aa7cf2;hp=db6981dd85c84fea75bf7c2c5cfe367748cc2433;hpb=95f270e6b3ec72bd29b5ac6e09f803dbaa64380e;p=proteocache.git

diff --git a/server/compbio/controllers/JobLogController.java b/server/compbio/controllers/JobLogController.java
index db6981d..28d6961 100644
--- a/server/compbio/controllers/JobLogController.java
+++ b/server/compbio/controllers/JobLogController.java
@@ -1,5 +1,6 @@
 package compbio.controllers;
 
+import java.security.Principal;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -16,14 +17,16 @@ import compbio.statistic.CassandraRequester;
 @Controller
 public class JobLogController {
 
-	@RequestMapping(value = "/joblog", method = RequestMethod.GET)
-	public String initFindForm(Map<String, Object> model) {
+	@RequestMapping(value = "/job/query", method = RequestMethod.GET)
+	public String initFindForm(Map<String, Object> model, Principal principal) {
+		model.put("username", principal.getName());
 		model.put("value", "jp_NzBOJKo");
 		return "queryJobLog";
 	}
 
-	@RequestMapping(value = "/joblog/query", method = RequestMethod.GET)
-	public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model) {
+	@RequestMapping(value = "/job/results", method = RequestMethod.GET)
+	public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model, Principal principal) {
+		model.put("username", principal.getName());
 		final long startTime = System.currentTimeMillis();
 		CassandraRequester cr = new CassandraRequester();
 		model.put("result", cr.readJobLog(jobid));