Changeset 37310

Timestamp:

2023-02-13T11:25:18+13:00 (15 months ago)

Author:

kjdon

Message:

webswing gli, gsdl_path etc get passed in unix-style. but if we are running as windows, we end up later with half and half paths, with some unix, some windows slashes. this causes problems eg current collect dir (from config file) not matching gli default collect dir. So best to convert paths here. Need to add File separator back on the the end as GLI expects this.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -155 +155 @@
     self = this; // allows Configuration to statically refer to itself in the static methods
 
-    this.gli_user_directory_path = gli_user_directory_path;
-    this.gsdl_path = gsdl_path;
-    this.gsdl3_path = gsdl3_path;
-    this.gsdl3_src_path = gsdl3_src_path;
+    try {
+        // this mainly needed for webswing, where the paths are unix style, but if running on windows we need to convert them
+    this.gli_user_directory_path = new File(gli_user_directory_path).getCanonicalPath()+File.separator;
+    this.gsdl_path = new File(gsdl_path).getCanonicalPath()+File.separator;
+    this.gsdl3_path = new File(gsdl3_path).getCanonicalPath()+File.separator;
+    this.gsdl3_src_path = new File(gsdl3_src_path).getCanonicalPath()+File.separator;
+    } catch(IOException e) {
+        System.err.println("IOException with supplied path arguments:"+e.getMessage());
+        System.exit(0);
+    }
     this.site_name = site_name;
     this.servlet_path = servlet_path;