From c3f8a850072ca2c9b947e6d6fcd2cedd20fe1b73 Mon Sep 17 00:00:00 2001
From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Mon, 13 Jan 2014 13:31:27 +0000
Subject: [PATCH] Add direct links to Jpred jobs

---
 server/compbio/controllers/JobController.java |   12 +++++++++++-
 webapp/view/reports/Job.jsp                   |    3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/server/compbio/controllers/JobController.java b/server/compbio/controllers/JobController.java
index 264a5d1..9987bd5 100644
--- a/server/compbio/controllers/JobController.java
+++ b/server/compbio/controllers/JobController.java
@@ -1,6 +1,8 @@
 package compbio.controllers;
 
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -121,9 +123,10 @@ public class JobController extends BasicController {
 	 * @param model
 	 *            MVC model
 	 * @return link to the JSP query page
+	 * @throws IOException
 	 */
 	@RequestMapping(value = "/job/results", method = RequestMethod.GET)
-	public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model) {
+	public String findJob(@RequestParam("IdJob") String jobid, Map<String, Object> model) throws IOException {
 		model.put("username", getPrincipalName());
 		final long startTime = System.currentTimeMillis();
 		JobReader reader = new JobReader();
@@ -139,6 +142,13 @@ public class JobController extends BasicController {
 			log.error("JobController.prepareJobArchiveToWeb: IO exception with job archive file");
 			log.error(e.getLocalizedMessage(), e.getCause());
 		}
+		// add a direct link to the job
+		String remotelink = "http://www.compbio.dundee.ac.uk/www-jpred/results/" + jobid + "/" + jobid + ".results.html";
+		URL remotelinkurl = new URL(remotelink);
+		HttpURLConnection httpConnection_remotelinkurl = (HttpURLConnection) remotelinkurl.openConnection();
+		if (199 < httpConnection_remotelinkurl.getResponseCode() && httpConnection_remotelinkurl.getResponseCode() < 300) {
+			model.put("jobremotelink", remotelink);
+		}
 		return "reports/Job";
 	}
 
diff --git a/webapp/view/reports/Job.jsp b/webapp/view/reports/Job.jsp
index 64d7896..4883412 100644
--- a/webapp/view/reports/Job.jsp
+++ b/webapp/view/reports/Job.jsp
@@ -28,6 +28,9 @@
 				<spring:url value="../${jobarchive}" var="jobarchivefile" />
 				<p>Job archive: <a title="Click to get the file" href="${jobarchivefile}">download</a></p>
 			</c:if>
+			<c:if test='${jobremotelink != null}'>
+				<p>Original job link: <a title="Click to go to original job" href="${jobremotelink}">view</a></p>
+			</c:if>
 			<div class="grid-wrapper-div">
 			<table class="table table-striped table-hover table-bordered">
 			<tbody>
-- 
1.7.10.2