Changeset 4669

Timestamp:

2003-06-16T09:58:50+12:00 (21 years ago)

Author:

jmt12

Message:

Local library stuff

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

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

@@ -49 +49 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.GAuthenticator;
+import org.greenstone.gatherer.cdm.CommandTokenizer;
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileManager;
@@ -298 +299 @@
     }
     if(assoc_man != null) {
-        assoc_man.destroy();
+        assoc_man.save();
         assoc_man = null;
     }
@@ -684 +685 @@
         gsdlsite_cfg.set();
         // Spawn server
-        String[] command = new String[3];
+        String[] command = new String[2];
         command[0] = config.exec_file.getAbsolutePath();
-        command[1] = "-config_file";
-        command[2] = gsdlsite_cfg.getSiteConfigFilename();
+        command[1] = gsdlsite_cfg.getSiteConfigFilename();
         server = new ExternalApplication(command);
         server.start();
@@ -702 +702 @@
             // Ta-da. Now the url should be available.
             config.exec_address = new URL(url);
+
+            // A quick test involves opening a connection to get the home page for this collection. If this fails then we try changing the url to be localhost.
+            try {
+            Gatherer.println("Try connecting to server on config url.");
+            URLConnection connection = config.exec_address.openConnection();
+            connection.getContent();
+            }
+            catch(IOException bad_url_connection) {
+            try {
+                Gatherer.println("Try connecting to server on local host.");
+                config.exec_address = new URL(gsdlsite_cfg.getLocalHostURL());
+                URLConnection connection = config.exec_address.openConnection();
+                connection.getContent();
+            }
+            catch(IOException worse_url_connection) {
+                Gatherer.println("Can't connect to server on either address.");
+                config.exec_address = null;
+                config.exec_file = null;
+            }
+            }
         }
         catch (Exception error) {
@@ -769 +789 @@
      * @param command The initial command <strong>String</strong>.
      */
-    public ExternalApplication(String command) {
-        this.command = new String[1];
-        this.command[0] = command;
+    public ExternalApplication(String large_command) {
+        CommandTokenizer tokenizer = new CommandTokenizer(large_command);
+        while(tokenizer.hasMoreTokens()) {
+        if(command == null) {
+            command = new String[1];
+            command[0] = tokenizer.nextToken();
+        }
+        else {
+            command = ArrayTools.add(command, tokenizer.nextToken());
+        }
+        }
     }