Changeset 12647

Timestamp:

2006-09-01T13:56:53+12:00 (18 years ago)

Author:

mdewsnip

Message:

The last of the new plugins and classifiers code: collection-specific plugins and classifiers with remote building.

Location:

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

Files:

• Classifiers.java (modified) (2 diffs)
• Plugins.java (modified) (2 diffs)

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

@@ -131 +131 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", "&classifier=" + classifier);
+        String classinfo_options = "&classifier=" + classifier;
+        if (collection_specific) {
+            classinfo_options += "&collection=" + collection_name;
+        }
+        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
         xml = new StringBuffer(classinfo_output);
         }
@@ -185 +189 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", "&listall");
+        String classinfo_options = "&listall";
+        if (collection_name != null) {
+            classinfo_options += "&collection=" + collection_name;
+        }
+        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", classinfo_options);
         xml = new StringBuffer(classinfo_output);
         }

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

@@ -132 +132 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", "&plugin=" + plugin);
+        String pluginfo_options = "&plugin=" + plugin;
+        if (collection_specific) {
+            pluginfo_options += "&collection=" + collection_name;
+        }
+        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
         xml = new StringBuffer(pluginfo_output);
         }
@@ -186 +190 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", "&listall");
+        String pluginfo_options = "&listall";
+        if (collection_name != null) {
+            pluginfo_options += "&collection=" + collection_name;
+        }
+        String pluginfo_output = RemoteGreenstoneServer.getScriptOptions("pluginfo.pl", pluginfo_options);
         xml = new StringBuffer(pluginfo_output);
         }