Changeset 23143 for main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

Timestamp:

2010-10-15T20:33:43+13:00 (14 years ago)

Author:

ak19

Message:

More changes to making collectdir movable: 1. When not working with a remote GS or server.exe: if the collecthome set in GLI is not the same as the one in gsdlsite.cfg used by the apache web server, then a dialog pops up on exiting GLI allowing the user to set the collecthome value for both GLI (in the user's GLI config.xml) and the server (in gsdlsite.cfg). 2. Collecthome line in gsdlsite.cfg is removed if it is the default GS collect folder. (Just as a recent commit stores an empty string for the open_collection element in the GLI config.xml file if no collection is left open on exiting GLI and the collect folder is the default GS collect directory.) 3. Some bug fixes.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -461 +461 @@
 
     
-    /** Write out a property line--a (property, value) pair--to the gsdl(3)site.cfg file.
+  /** Write out a property line--a (property, value) pair--to the gsdl(3)site.cfg file.
      * If the file already contains the line as-is, it is not re-written.   
      * If the file doesn't contain the line, it is appended.
      * If the file contained a different value for the property, the line is corrected
      * and the file is written out.
+     * If the propertyValue parameter is null, the property line is removed from the file.
      * Not using the Properties class, as we want to keep the file's contents in the 
      * same order and preserve all the comments in as they're meant to help the user.
-     */
-    public static void updatePropertyConfigFile(String filename, String propertyName, String propertyValue) {
+     * Return the old value for the property, if it existed, else "".    
+     */
+    public static String updatePropertyConfigFile(
+        String filename, String propertyName, String propertyValue) 
+    {   
     File propFile = new File(filename);
+    String oldValue = "";
     if(!propFile.exists()) {
         System.err.println("*** Unable to update property " + propertyName + " in file " 
                 + filename + "to\n" + propertyValue + ". File does not exist.\n");
-        return;
+        return oldValue;
     }   
     BufferedReader fin = null;
     BufferedWriter fout = null;
     StringBuffer contents = new StringBuffer();
-    String insertLine = propertyName+"\t"+propertyValue+"\n"; // new line after every propertyLine
+    String insertLine = null;
+    if(propertyValue != null) {
+        insertLine = propertyName+"\t"+propertyValue+"\n"; // new line after every propertyLine
+    }
     boolean found = false;
     try {
@@ -485 +493 @@
         String line = "";
         while((line = fin.readLine()) != null) {
-        if(line.startsWith(propertyName)) { // won't match comment
-            found = true;
-            if(line.equals(insertLine)) { // file is already correct, nothing to do
+            line = line.trim(); // remove any preceding (surrounding) whitespace
+            if(line.startsWith(propertyName)) { // won't match comment
+                found = true;
+                // store the previous value for the property
+                oldValue = line;
+                oldValue = oldValue.substring(propertyName.length());
+                oldValue = oldValue.trim();
+                
+                if(propertyValue != null) { // line should be removed if propertyValue == null
+                    if(line.equals(insertLine)) { // file is already correct, nothing to do
+                        fin.close();
+                        fin = null;
+                        break;
+                    } else {
+                        contents.append(insertLine);
+                    }
+                }
+            } else { // any other line
+                contents.append(line);          
+                contents.append("\n"); // ensures the required new line at end of file
+            }
+        }       
+
+        if(fin != null) { // need to write something out to the file
             fin.close();
             fin = null;
-            break;
-            } else {
-            contents.append(insertLine);
-            }
-
-        } else { // any other line
-            contents.append(line);          
-            contents.append("\n"); // ensures the required new line at end of file
-        }
-        }
-
-        if(fin != null) { // need to write something out to the file
-        fin.close();
-        fin = null;
-
-        // if collecthome wasn't already specified in the file, append it
-        if(!found) { 
-            fout = new BufferedWriter(new FileWriter(filename, true)); // append mode
-            fout.write(insertLine, 0, insertLine.length());
-        } else {
-            
-            fout = new BufferedWriter(new FileWriter(filename)); // hopefully this will overwrite
-            fout.write(contents.toString(), 0, contents.length());
-        }
-
-        fout.close();
-        fout = null;
+
+            // if collecthome/property wasn't already specified in the file, append it
+            // but only if we have a value to write out to the file
+            if(!found && propertyValue != null) {       
+                fout = new BufferedWriter(new FileWriter(filename, true)); // append mode
+                fout.write(insertLine, 0, insertLine.length());
+            } else {            
+                fout = new BufferedWriter(new FileWriter(filename)); // hopefully this will overwrite
+                fout.write(contents.toString(), 0, contents.length());
+            }
+
+            fout.close();
+            fout = null;
+            
         } // else the file is fine
     } catch(IOException e) {
@@ -538 +554 @@
         
     }
-    
-    }
-   
+        return oldValue;
+    }
 }