Changeset 18987 for gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

Timestamp:

2009-04-15T18:27:33+12:00 (15 years ago)

Author:

ak19

Message:

Updated several files such that the Server2 code in server.jar can interact with GLI code so that the local GS2 server for Linux works the same way as the GS2 Local Library Server on windows.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java (modified) (2 diffs)

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

@@ -80 +80 @@
         return;
     }
+
+    // check that the local library server is still running  - doesn't do anything if it's not supposed to be running
+    // !! Don't like this here
+    LocalLibraryServer.checkServerRunning();
+    
     // FLI or GLI for GS2 case (no library_url)
     preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
@@ -124 +129 @@
         
         configureHomeURL();
-        // check that the local library server is still running  - doesn't do anything if its not supposed to be running
-        // !! Don't like this here
-        LocalLibraryServer.checkServerRunning();
+        
         if (Gatherer.GS3) {
         // we need to rerun the convert in case the format stuff has changed