Changeset 29300

Timestamp:

2014-09-17T19:43:22+12:00 (10 years ago)

Author:

ak19

Message:

Fix to recent commit. Now the formatconverter binaries for the 3 OS are in their own new OS subfolders. However, they all share a single tidyconfig.cfg for html-tidy, which is still located in the bin superfolder.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (1 diff)
• gui/FormatConversionDialog.java (modified) (1 diff)

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

@@ -698 +698 @@
     }
 
+    /** @return path to GS3/bin */
     static public String getGS3BinPath() {
-    return gsdl3_src_path + "bin" + File.separator + Utility.getOSdirName() + File.separator;
+    return gsdl3_src_path + "bin" + File.separator;
+    }
+
+    /** @return path to GS3/bin/OS, where OS is windows, darwin or linux */
+    static public String getGS3BinOSPath() {
+    return getGS3BinPath() + Utility.getOSdirName() + File.separator;
     }
 

main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

@@ -73 +73 @@
     // Online HTML tidy for learning usage: http://infohound.net/tidy/
     private static final String[] xmltidy_cmd_args = {"tidy", "-config", Configuration.getGS3BinPath() + "tidyconfig.cfg", "-utf8", "-wrap", "0", "-raw", "-q"}; // {"tidy", "-xml", "-utf8"};
-    private static final String[] formatconverter_cmd_base_args = {Configuration.getGS3BinPath() + "formatconverter", "--silent"};
+    private static final String[] formatconverter_cmd_base_args = {Configuration.getGS3BinOSPath() + "formatconverter", "--silent"};
 
     private static final Dimension SIZE = new Dimension(640,480);