Changeset 10726 for trunk/gli/src/org/greenstone/gatherer/cdm

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.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (3 diffs)
• CollectionConfiguration.java (modified) (1 diff)
• PluginManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -43 +43 @@
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -311 +312 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String launch  = Gatherer.cgiBase + "launch";
-        launch += "?cmd=classinfo.pl";
-        launch += "&xml=&language="+lang;
-        launch += "&class=" + getClassifierName(classifier);
-        
-        System.err.println("*** launch = " + launch);
-        
-        URL launch_url = new URL(launch);
-        URLConnection launch_connection = launch_url.openConnection();
-        input_stream = launch_connection.getInputStream();
-        xml = Utility.readXMLStream(input_stream);
+        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", "&classifier=" + classifier);
+        xml = new StringBuffer(classinfo_output);
         }
         else {
@@ -386 +378 @@
 
         if (Gatherer.isGsdlRemote) {
-
-        String lang = Configuration.getLanguage();
-
-        String launch  = Gatherer.cgiBase + "launch";
-        launch += "?cmd=classinfo.pl";
-        launch += "&xml=&language="+lang;
-        launch += "&listall=";
-
-        System.err.println("*** launch = " + launch);
-
-        try {
-            URL launch_url = new URL(launch);
-            URLConnection launch_connection = launch_url.openConnection();
-            InputStream input_stream = launch_connection.getInputStream();
-            StringBuffer xml = Utility.readXMLStream(input_stream);
-            loadClassifiers(xml);
-        }
-        catch (Exception error) {
-            System.err.println("Failed when trying to connect to : " + launch);
-            error.printStackTrace();
-        }
-
-        }
+        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", "&listall=");
+        loadClassifiers(new StringBuffer(classinfo_output));
+        }
+
         else {
-
         // Retrieve the gsdl home directory...
         String directory = LocalGreenstone.getDirectoryPath();

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -511 +511 @@
         if (Gatherer.isGsdlRemote) {
             String collection_name = Gatherer.c_man.getCollection().getName();
-            ZipTools.zipup(Gatherer.getCollectDirectoryPath(), collection_name, "collect.cfg", null, "", "");
-            RemoteGreenstoneServer.upload_url_zip(collection_name, "etc", "", null);
+            RemoteGreenstoneServer.uploadCollectionFile(collection_name, collect_cfg_file);
         }
         }

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -47 +47 @@
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.WarningDialog;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -443 +444 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String launch  = Gatherer.cgiBase + "launch";
-        launch += "?cmd=pluginfo.pl";
-        launch += "&xml=&language="+lang;
-        launch += "&plug=" + getPluginName(plugin);
-        
-        System.err.println("*** launch = " + launch);
-        
-        URL launch_url = new URL(launch);
-        URLConnection launch_connection = launch_url.openConnection();
-        input_stream = launch_connection.getInputStream();
-        xml = Utility.readXMLStream(input_stream);
+        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", "&plugin=" + plugin);
+        xml = new StringBuffer(pluginfo_output);
         }
         else {
@@ -514 +506 @@
     if(library == null) {
         library = new ArrayList();
+
         if (Gatherer.isGsdlRemote) {
-
-        String lang = Configuration.getLanguage();
-
-        String launch  = Gatherer.cgiBase + "launch";
-        launch += "?cmd=pluginfo.pl";
-        launch += "&xml=&language="+lang;
-        launch += "&listall=";
-
-        System.err.println("*** launch = " + launch);
-
-        try {
-            URL launch_url = new URL(launch);
-            URLConnection launch_connection = launch_url.openConnection();
-            InputStream input_stream = launch_connection.getInputStream();
-            StringBuffer xml = Utility.readXMLStream(input_stream);
-            loadPlugins(xml);
-        }
-        catch (Exception error) {
-            System.err.println("Failed when trying to connect to : " + launch);
-            error.printStackTrace();
-        }
-
-        }
+        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", "&listall=");
+        loadPlugins(new StringBuffer(pluginfo_output));
+        }
+
         else {
         // Retrieve the gsdl home directory...