Changeset 19585 for gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2009-05-25T13:42:15+12:00 (15 years ago)

Author:

ak19

Message:

Changes made when re-testing the independently launchend GSI (and the GSI launched through GLI) on Windows.

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (7 diffs)

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

@@ -200 +200 @@
     } else if(llssite_cfg_file.isIndependentGSI()) {
         // there is a url, it's not pending, and it is llssite.cfg: meaning GSI has started up
+        running = true;
         return;     
     }
@@ -397 +398 @@
         }
         catch (MalformedURLException exception) {
+            running = false;
             exception.printStackTrace();
-            DebugStream.printStackTrace(exception);
+            DebugStream.printStackTrace(exception);         
         }
         return false;
@@ -415 +417 @@
     String url = llssite_cfg_file.getURL();
     if(url != null) {
-        if(isURLPending()) {
+        if(url.equals(LLSSiteConfig.URL_PENDING)) {
         running = false;
         return;
@@ -423 +425 @@
         try {
         Configuration.library_url = new URL(url);
+        running = true;
         }
         catch (MalformedURLException exception) {
+        running = false;
         DebugStream.printStackTrace(exception);
         exception.printStackTrace();
         }
-    } 
+    }
     else { // NO URL in current ConfigFile, check the other configfile for a URL 
         // to see if the server was restarted using that file.
@@ -435 +439 @@
 
         if(llssite_cfg_file.usingLLS_configFile()) { // if a GSI is already using llssite_cfg, this would have loaded it in
-        if(isURLPending()) {
+        url = llssite_cfg_file.getURL(); //if(isURLPending()) {
+        if(url.equals(LLSSiteConfig.URL_PENDING)) {
             running = false;
         } else {
@@ -525 +530 @@
 
     /** Tries to get a glisite.cfg file and then loads it, setting it as the configFile */
-    public void useGLISiteCfg(File server_exe) {
+    public void useGLISiteCfg(File server_exe)
+    {
         if(!glisite_cfg.exists()) { // create it from the templates or the llssite.cfg file
         
@@ -577 +583 @@
 
         lastModified = configFile.lastModified();
-        //System.err.println("***** we're using llssite_configfile, url:" + getURL());
         return true;
     }