Changeset 10726 for trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2005-10-14T15:19:36+13:00 (19 years ago)

Author:

mdewsnip

Message:

(MAJOR CHANGE) This is the remote Greenstone building functionality implemented for the West Yorkshire Fire and Rescue Service. It allows collections to be built without having a local version of Greenstone, using either a stand-alone version of the GLI or the applet.

The collections are stored on the server (allowing people to collaborate on collections -- but not at the same time), and only what is necessary to let the user edit the collection is downloaded. Any changes to the collection are uploaded to the server.

An access restriction mechanism is implemented which uses the standard Greenstone user database to control who has access to collections.

File:

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

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

@@ -47 +47 @@
 import org.greenstone.gatherer.gui.URLField;
 import org.greenstone.gatherer.gui.WarningDialog;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -93 +94 @@
     static public boolean isApplet = false;
     static public boolean isGsdlRemote = false;
-    static public String cgiBase = null;
 
     // feedback stuff
@@ -293 +293 @@
         if (Configuration.gliserver_url != null) {
             gliserver_url_string = Configuration.gliserver_url.toString();
-            cgiBase = gliserver_url_string.substring(0, gliserver_url_string.lastIndexOf('/') + 1);
         }
         }
@@ -508 +507 @@
     if (LocalLibraryServer.isRunning() == true) {
         LocalLibraryServer.stop();
+    }
+
+    // If we're using a remote Greenstone server we need to make sure that all jobs have completed first
+    if (isGsdlRemote) {
+        RemoteGreenstoneServer.exit();
     }