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

Timestamp:

2010-08-17T18:43:08+12:00 (14 years ago)

Author:

ak19

Message:

Next set of changes for ticket 152: moveable collectdir (so that collect dir can be on a pen drive). These are changes for when GLI's LocalLibraryServer tells server.jar to reconfigure itself (to update the COLLECTHOME alias in the apache web server's httpd.conf file when the collectdir has changed) and restart the server.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -829 +829 @@
 
     // non-destructive update of gsdl(3)site.cfg (comments preserved)
-    Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", Gatherer.getCollectDirectoryPath());
+    String collectDir = Gatherer.getCollectDirectoryPath();
+    collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end    
+    Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", collectDir);
+
+    if(!Gatherer.GS3 && Gatherer.isLocalLibrary) {
+        // for Images in the collection to work, the apache web server 
+        // configuration's COLLECTHOME should be updated on collectdir change. 
+        // Does nothing for server.exe at the moment
+
+        LocalLibraryServer.reconfigure();
+    }
     }