From 9b211165df11d88edd6abf8fa9bbc6f6d94c28b1 Mon Sep 17 00:00:00 2001
From: gojomo <gojomo@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Fri, 6 Nov 2009 22:18:47 +0000
Subject: [PATCH] [HER-1698] report generation gives text of path, without
 showing report * JobResource.java     make getHrefPath public static utility
 method * ReportGenResource.java     use getHrefPath so '/anypath/' URLs are
 used where needed

---
 .../org/archive/crawler/restlet/JobResource.java    | 13 +++++++++++--
 .../archive/crawler/restlet/ReportGenResource.java  |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
index 090ffcd8..55dfa155 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java
@@ -355,7 +355,7 @@ public class JobResource extends Resource {
      * @param f File
      */
     protected void printLinkedFile(PrintWriter pw, File f, String linktext, String queryString) {      
-        String relativePath = getHrefPath(f);
+        String relativePath = JobResource.getHrefPath(f,cj);
         pw.println("<a href='" 
                 + relativePath 
                 + ((queryString==null) ? "" : "?" + queryString)
@@ -368,7 +368,16 @@ public class JobResource extends Resource {
         }
     }
 
-    protected String getHrefPath(File f) {
+    /**
+     * Get a usable HrefPath, relative to the JobResource, for the given
+     * file. Assumes usual helper resources ('jobdir/', 'anypath/') at
+     * the usual locations.
+     * 
+     * @param f File to provide an href (suitable for clicking or redirection)
+     * @param cj CrawlJob for calculating jobdir-relative path if possible
+     * @return String path suitable as href or Location header
+     */
+    public static String getHrefPath(File f, CrawlJob cj) {
         String jobDirRelative = cj.jobDirRelativePath(f);
         if(jobDirRelative!=null) {
             return "jobdir/"+jobDirRelative;
diff --git a/engine/src/main/java/org/archive/crawler/restlet/ReportGenResource.java b/engine/src/main/java/org/archive/crawler/restlet/ReportGenResource.java
index 936c95fb..101b2b30 100644
--- a/engine/src/main/java/org/archive/crawler/restlet/ReportGenResource.java
+++ b/engine/src/main/java/org/archive/crawler/restlet/ReportGenResource.java
@@ -52,9 +52,9 @@ public class ReportGenResource extends JobRelatedResource {
             throw new ResourceException(500);
         }
         // redirect
-        String relative = cj.jobDirRelativePath(f);
+        String relative = JobResource.getHrefPath(f,cj);
         if(relative!=null) {
-            getResponse().redirectSeeOther("../jobdir/"+relative+"?m="+f.lastModified());
+            getResponse().redirectSeeOther("../"+relative+"?m="+f.lastModified());
             return new StringRepresentation("");
         } else {
             return new StringRepresentation(