Changeset 18987 for gli/trunk/src/org/greenstone/gatherer/Gatherer.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/Gatherer.java (modified) (4 diffs)

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

@@ -325 +325 @@
         }
         else { // local greenstone: Start up the local library server, if that's what we want
-        if (Utility.isWindows() && local_library_path != null && !GS3) {
+        if (local_library_path != null && !GS3) {
             LocalLibraryServer.start(gsdl_path, local_library_path);
         }
@@ -795 +795 @@
     apps.add(app);
     app.start();
+    }
+
+    static public void spawnApplication(String command, String ID)
+    {
+    ExternalApplication app = new ExternalApplication(command, ID);
+    apps.add(app);
+    app.start();
+    }
+
+    static public void terminateApplication(String ID) {
+    for(int i = 0; i < apps.size(); i++) {
+        ExternalApplication app = (ExternalApplication)apps.get(i);
+        if(app.getID() != null && app.getID().equals(ID)) {
+        app.stopExternalApplication();
+        apps.remove(app);
+        }
+    }
     }
 
@@ -1060 +1077 @@
     private String command = null;
     private String[] commands = null;
+
+    private String ID = null;
+
     /** Constructor.
      * @param command The initial command <strong>String</strong>.
@@ -1070 +1090 @@
         this.commands = commands;
     }
+
+    public ExternalApplication(String command, String ID) {
+        this.command = command;
+        this.ID = ID;
+    }
+    
+    public String getID() { 
+        return ID; 
+    }
+
     /** We start the child process inside a new thread so it doesn't block the rest of Gatherer.
      * @see java.lang.Exception