Changeset 1217

Timestamp:

12/06/11 16:05:52 (18 months ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb

Files:

• engine/ChartProcessor.java (modified) (2 diffs)
• model/RaptorJFreeChartModel.java (modified) (2 diffs)

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/ChartProcessor.java

@@ -90 +90 @@
                 baseGraphDirectory.mkdir();
 
-            // then check for the existence of the users directory within the bae
+            // then check for the existence of the users directory within the base
             root = saveDirectory.getFile().getCanonicalPath() + "/" + user;
             File dir = new File(root);
@@ -103 +103 @@
     }
 
-    private File getRelativePath(File dir) {
-        File relative = null;
+    private String getRelativePath(File dir) {
         try {
-            relative = new File(dir.getAbsolutePath().replace(baseDirectory.getFile().getAbsolutePath(), ""));
+            String relative = dir.getAbsolutePath().replace(baseDirectory.getFile().getAbsolutePath(), "");
+            log.debug("Absolute Path {}, base Path {}, Relative Path is {}",new Object[]{dir.getAbsoluteFile(),baseDirectory.getFile().getAbsolutePath(),relative});
+            relative = relative.replaceAll("\\\\","/");
+            return relative;
         } catch (IOException e) {
             log.error("Could not get relative path for file {}, {}", dir, e.getMessage());
-        }
-        return relative;
+            return "";
+        }
     }
 

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/RaptorJFreeChartModel.java

@@ -35 +35 @@
     private static final long serialVersionUID = -3533889063143775041L;
 
-    static Logger log = LoggerFactory.getLogger(RaptorJFreeChartModel.class);
+    private final Logger log = LoggerFactory.getLogger(RaptorJFreeChartModel.class);
 
     private File chartLocation;
-    private File relativeChartLocation;
+    private String relativeChartLocation;
     private JFreeChart chart;
 
@@ -49 +49 @@
     }
 
-    public void setRelativeChartLocation(File relativeChartLocation) {
+    public void setRelativeChartLocation(String relativeChartLocation) {
         this.relativeChartLocation = relativeChartLocation;
     }
 
-    public File getRelativeChartLocation() {
+    public String getRelativeChartLocation() {
         return relativeChartLocation;
     }
 
     public String getRelativeChartLocationPath(){
-        try {
-            return relativeChartLocation.getCanonicalPath();
-        } catch (IOException e) {
-           log.error("Could not get relative chart location for {}",relativeChartLocation);
-        }
-        return "";
+        return relativeChartLocation;
     }