Changeset 19547 for gli

Timestamp:

2009-05-21T16:44:28+12:00 (15 years ago)

Author:

ak19

Message:

Fixed up loose ends: restarting an external server - just as relaunching a server from within GLI - will work with the previewbutton.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• greenstone/LocalLibraryServer.java (modified) (8 diffs)
• gui/PreviewButton.java (modified) (3 diffs)

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

@@ -415 +415 @@
     String url = llssite_cfg_file.getURL();
     if(url != null) {
+        if(isURLPending()) {
+        running = false;
+        return;
+        }
+
+        // else, valid URL:
         try {
         Configuration.library_url = new URL(url);
@@ -422 +428 @@
         exception.printStackTrace();
         }
-    } else {
-        // need to restart the server again
- 
-        // if we were running an independently launched GSI before, but the GSI has been
-        // exited, it would need to be relaunched, but from within GLI (dependent) this time.
-        if(llssite_cfg_file.isIndependentGSI()) {
-        // first save the current configFile (llssite.cfg), then set to use glisite.cfg
-        llssite_cfg_file.save();
-        llssite_cfg_file.relaunchAsDependentGSI(local_library_server_file);
+    } 
+    else { // NO URL in current ConfigFile, check the other configfile for a URL 
+        // to see if the server was restarted using that file.
+        // Otherwise need to restart the server again with GLIsite.cfg
+        llssite_cfg_file.save(); // save the configfile, because we may be reloading another
+
+        if(llssite_cfg_file.usingLLS_configFile()) { // if a GSI is already using llssite_cfg, this would have loaded it in
+        if(isURLPending()) {
+            running = false;
+        } else {
+            running = true;
+        }
+        return; // don't need to launch the server, one has been independently launched
         } else {
-        // We were using glisite.cfg before, don't need to swap config files
-        llssite_cfg_file.set();
-        }
-        // Spawn local library server process
-        String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
-        running = false;
-        Gatherer.spawnApplication(local_library_server_command, ID);
-        try {
-        testServerRunning(); // don't return until the webserver is up and running
-        } catch (IOException bad_url_connection) {
-        DebugStream.println("Can't connect to server on address " + Configuration.library_url);
+        // else we try using the glisite configfile
+        llssite_cfg_file.useGLISiteCfg(local_library_server_file);
+            //llssite_cfg_file.set();
+        
+        // Spawn local library server process
+        String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
         running = false;
+        Gatherer.spawnApplication(local_library_server_command, ID);
+        try {
+            testServerRunning(); // don't return until the webserver is up and running
+        } catch (IOException bad_url_connection) {
+            DebugStream.println("Can't connect to server on address " + Configuration.library_url);
+            running = false;
+        }
         }
     }
@@ -492 +504 @@
     static final public String URL_PENDING = "URL_pending";
 
+    
     public LLSSiteConfig(File server_exe) {
         debug("New LLSSiteConfig for: " + server_exe.getAbsolutePath());
@@ -508 +521 @@
         // else we try using the glisite configfile
         useGLISiteCfg(server_exe);
-        }
-
-        if(configFile != null && configFile.exists()) {
-        System.err.println("Using configfile: " + configFile);
-        lastModified = configFile.lastModified();
         }
     }
@@ -542 +550 @@
         configFile = glisite_cfg;
         load(false); // force reload
+        lastModified = configFile.lastModified();
         } 
     }
@@ -552 +561 @@
      * and, if so, it would have loaded in the llssite_cfg configFile.
      */
-    private boolean usingLLS_configFile() {
+    public boolean usingLLS_configFile() {
         if(!llssite_cfg.exists()) {
         return false;
         }
 
-        // check if the configfile contains the URL line
+        // Now to check if the configfile contains the URL line
         configFile = llssite_cfg;
         load(false); // force load
@@ -567 +576 @@
         }
 
+        lastModified = configFile.lastModified();
         //System.err.println("***** we're using llssite_configfile, url:" + getURL());
         return true;
@@ -575 +585 @@
     public boolean isIndependentGSI() {
         return (configFile == llssite_cfg);
-    }
-
-    /** Call this when an independently launched GSI server has been stopped
-     * (one using llssite_cfg) and GLI needs to next launch another server.
-     * In such a case, since GLI itself is relaunching the GSI, we use glisite_cfg.
-    */
-    public void relaunchAsDependentGSI(File server_exe) {
-        useGLISiteCfg(server_exe);
     }
 

gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

@@ -91 +91 @@
     // !! Don't like this here
     LocalLibraryServer.checkServerRunning();
+    if(LocalLibraryServer.isURLPending()) {
+        // Remind the user to press Enter Library, and return from this method
+        JOptionPane.showMessageDialog(Gatherer.g_man,
+                      Dictionary.get("General.LLS_Not_Started"), 
+                      Dictionary.get("General.LLS_Not_Started_Title"),
+                      JOptionPane.ERROR_MESSAGE);
+        preview_address = null;
+        return;   
+    } 
     
     // FLI or GLI for GS2 case (no library_url)
@@ -135 +144 @@
         Gatherer.c_man.saveCollection();
         
-        if(LocalLibraryServer.isURLPending()) {
-        // Remind the user to press Enter Library, and return from this method
-        JOptionPane.showMessageDialog(Gatherer.g_man,
-                          Dictionary.get("General.LLS_Not_Started"), 
-                          Dictionary.get("General.LLS_Not_Started_Title"),
-                          JOptionPane.ERROR_MESSAGE);
-        return;
-        
-        } else {
-        configureHomeURL();
-        }
+        configureHomeURL();
         
         if (Gatherer.GS3) {
@@ -152 +151 @@
         Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + Gatherer.c_man.getLoadedCollectionName());
         }
-        Gatherer.spawnBrowser(preview_address);
+        if(preview_address != null) {
+        Gatherer.spawnBrowser(preview_address);
+        }
 
     }