Changeset 24904

Timestamp:

2011-12-15T20:21:40+13:00 (12 years ago)

Author:

ak19

Message:

Need quotes around collecthome in gsdlsite.cfg to handle spaces and brackets in any non-standard collecthome path.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)
• gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (1 diff)
• greenstone2/gsicontrol.bat (modified) (1 diff)

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

@@ -902 +902 @@
             } else {
                 gsdlsite_collecthome = Utility.updatePropertyConfigFile(
-                gsdlsitecfg, "collecthome", coldir); // no file separator
+                gsdlsitecfg, "collecthome", "\""+coldir+"\""); // no file separator
                 // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
             }
@@ -977 +977 @@
             //collectDir = "\"" + collectDir.substring(0, collectDir.length()-1) + "\""; // remove file separator at end    
             collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end    
-            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", collectDir);
+            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", "\""+collectDir+"\"");
             // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
             

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

@@ -677 +677 @@
                                 
                 Gatherer.gsdlsite_collecthome = Utility.updatePropertyConfigFile(
-                    Gatherer.getGsdlSiteConfigFile(), "collecthome", serverColDir); 
+                    Gatherer.getGsdlSiteConfigFile(), "collecthome", "\""+serverColDir+"\"");   
                 
                 colHomeDialog.dispose();

main/trunk/greenstone2/gsicontrol.bat

@@ -234 +234 @@
 :: first remove any quotes around this part of the filepath
 set suffix=%~1
-if not "%suffix%" == "gsdlhome" set gshome=%gshome%%suffix%
+if not "%suffix%" == "gsdlhome" if not "%suffix%" == "collecthome" set gshome=%gshome%%suffix%
 shift
 if not "%~1"=="" goto concat