Changeset 24905 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2011-12-15T21:52:46+13:00 (12 years ago)

Author:

ak19

Message:

Now that quotes are necessary around collecthome in gsdlsite.cfg if there are spaces in the collecthome path, this needs to propagate into GLI: a dialog pops up on GLI exit if collecthome has changed. But collecthome has not changed if all that's been added is quotes around the collecthome variable as read from gsdlsite.cfg.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

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

@@ -925 +925 @@
     public static void collectDirectoryHasChanged(
     String oldCollectPath, String newCollectPath, final Component container) 
-    {   
+    {       
         if(oldCollectPath.equals(newCollectPath)) {
             return; // nothing to be done
@@ -976 +976 @@
             String collectDir = Gatherer.getCollectDirectoryPath();
             //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+"\"");
+            collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end
+            if(collectDir != null) {
+                collectDir = "\""+collectDir+"\"";
+            }
+            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", collectDir);
             // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return