Changeset 22911

Timestamp:

2010-09-15T18:49:33+12:00 (13 years ago)

Author:

ak19

Message:

gsdlsite.cfg which gets updated when collectdir is changed may not exist the first time round (like when gs2 is just checked out from svn and you want to change the default collectdir from that of a previous gs2 installation to the new one). But it is the apache web server that needs gsdlsite.cfg (for collecthome), not server.exe.

Location:

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

Files:

• Gatherer.java (modified) (1 diff)
• greenstone/LocalLibraryServer.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

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

@@ -880 +880 @@
             collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end    
             Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", collectDir);
-
+                    // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
+            
             if(!Gatherer.GS3 && Gatherer.isLocalLibrary) {
                 // for Images in the collection to work, the apache web server 

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

@@ -729 +729 @@
                     + "cgi-bin" + File.separator + "gsdlsite.cfg";
                 Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", collectDir); // no file separator at end
+                    // 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/util/Utility.java

@@ -470 +470 @@
      */
     public static void updatePropertyConfigFile(String filename, String propertyName, String propertyValue) {
+    File propFile = new File(filename);
+    if(!propFile.exists()) {
+        System.err.println("*** Unable to update property " + propertyName + " in file " 
+                + filename + "to\n" + propertyValue + ". File does not exist.\n");
+        return;
+    }   
     BufferedReader fin = null;
     BufferedWriter fout = null;