Changeset 22678

Timestamp:

2010-08-18T21:26:45+12:00 (14 years ago)

Author:

ak19

Message:

More changes for making the collectdir movable (ticket 152): (1) Changes to GLI code so that llssite and glisite are updated to contain the COLLECTHOME property to tell server.exe where the new collect dir is. (2) server.exe must be told that it needs to restart (so it can read the new collecthome).

Location:

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

Files:

• collection/CollectionManager.java (modified) (1 diff)
• greenstone/LocalLibraryServer.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -424 +424 @@
     ProfileXMLFileManager.clearProfileXMLFile();
 
+    // If we're using the Local Library we must release the collection before writing to the collect.cfg file
+    if(Gatherer.isLocalLibrary) {
+        LocalLibraryServer.releaseCollection(collection.getName());
+    }
+    
     collection.destroy();
     collection = null;

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

@@ +1 @@
+/**
 /**
  *############################################################################
@@ -48 +49 @@
     static final private String RELEASE_COMMAND = "?a=config&cmd=release-collection&c=";
     static final private String QUIT_COMMAND = "?a=config&cmd=kill";
+    static final private String RESTART_COMMAND = "?a=config&cmd=restart";
 
     static private LLSSiteConfig llssite_cfg_file = null;
@@ -295 +297 @@
      * the web server launched by GLI. */
     static public void reconfigure() {
-    if(isPersistentServer) {
-        System.err.println("***** Reconfigure is not yet implemented for server.exe");
+    if(isPersistentServer) {                
+        // 1st: server may have nulled URL if server was stopped inbetween, 
+        // so load that new URL, if GLI conf file modified
+        // Then put the new collectDir into the GLI configfile being used
+        llssite_cfg_file.load(true);        
+        
+        String collectDir = Gatherer.getCollectDirectoryPath();
+        collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end
+        llssite_cfg_file.put(LLSSiteConfig.COLLECTHOME, collectDir);            
+        llssite_cfg_file.save();
+        
+        // tell the server to restart, so it will read the new configuration
+        
+        // (1) need a server to be running in order for us to send a restart message to it
+        if(checkServerRunning()) { // if true, it wasn't running before, but has now restarted the server. We're done
+            return; 
+        }
+        // (2) otherwise the server may already have been running, need to tell it to restart after setting the collect dir
+        if(running) {
+            config(RESTART_COMMAND);        
+        }       
         return;
     }
@@ -650 +671 @@
     static final private String TRUE = "1";
     static final private String URL = "url";
-
+    static final private String COLLECTHOME = "collecthome";
+    
     static final public String URL_PENDING = "URL_pending";
 
@@ -850 +872 @@
             put(key, value);
             }
-            in.close();
+            
+            in.close();
         }
         catch (Exception error) {