Changeset 10370

Timestamp:

2005-08-01T13:40:37+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a new LocalGreenstone class which contains functions that only make sense with a local Greenstone.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (1 diff)
• Gatherer.java (modified) (1 diff)
• LocalGreenstone.java (added)
• cdm/ClassifierManager.java (modified) (3 diffs)
• cdm/PluginManager.java (modified) (3 diffs)
• collection/CollectionManager.java (modified) (4 diffs)
• collection/ScriptOptions.java (modified) (3 diffs)
• gui/ExplodeMetadataPrompt.java (modified) (2 diffs)
• gui/ExportAsPrompt.java (modified) (4 diffs)
• gui/WriteCDImagePrompt.java (modified) (3 diffs)

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

@@ -674 +674 @@
     }
 
-    /** Retrieve the path to the PERL scripts within the Greenstone directory.
-     * @return A <strong>String</strong> containing the path.
-     */
-    static public String getScriptPath() {
-    return gsdl_path + "bin" + File.separator + "script" + File.separator;
-    }
-
     static public String getGS3ScriptPath() {
     return gsdl3_src_path + "bin" + File.separator + "script" + File.separator;
-    }
-
-    static public String getTmpDirectoryPath()
-    {
-    return gsdl_path + "tmp" + File.separator;
     }
 

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

@@ -144 +144 @@
     }
 
+    // We have a local Greenstone
+    if (!isGsdlRemote) {
+        LocalGreenstone.setDirectoryPath(go.gsdl_path);
+    }
+
     // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)
     if (go.collect_directory_path != null) {

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

@@ -40 +40 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
@@ -330 +331 @@
             args[0] = "Perl.exe";
             }
-            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
+            args[1] = LocalGreenstone.getBinScriptDirectoryPath() + "classinfo.pl";
             args[2] = "-xml";
             args[3] = "-language";
@@ -408 +409 @@
 
         // Retrieve the gsdl home directory...
-        String directory = Configuration.gsdl_path;
+        String directory = LocalGreenstone.getDirectoryPath();
         directory = directory + "perllib" + File.separator + "classify" + File.separator;
 

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

@@ -41 +41 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.collection.CollectionContentsChangedListener;
 import org.greenstone.gatherer.gui.GComboBox;
@@ -462 +463 @@
             args[0] = "Perl.exe";
             }
-            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
+            args[1] = LocalGreenstone.getBinScriptDirectoryPath() + "pluginfo.pl";
             args[2] = "-xml";
             args[3] = "-language";
@@ -536 +537 @@
         else {
         // Retrieve the gsdl home directory...
-        String directory = Configuration.gsdl_path;
+        String directory = LocalGreenstone.getDirectoryPath();
         directory = directory + "perllib" + File.separator + "plugins" + File.separator;
         loadPlugins(new File(directory));

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.LocalLibraryServer;
 import org.greenstone.gatherer.ServletConfiguration;
@@ -144 +145 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "buildcol.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -655 +656 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "import.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -913 +914 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "mkcol.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "mkcol.pl");
 
     command_parts_list.add("-collectdir");

trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -9 +9 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.cdm.Argument;
 import org.greenstone.gatherer.util.ArrayTools;
@@ -305 +306 @@
             args[0] = Configuration.perl_path;
             args[1] = "-S";
-            args[2] = Configuration.getScriptPath() + filename;
+            args[2] = LocalGreenstone.getBinScriptDirectoryPath() + filename;
             args[3] = "-xml";
             args[4] = "-language";
@@ -312 +313 @@
         else {
             args = new String[4];
-            args[0] = Configuration.getScriptPath() + filename;
+            args[0] = LocalGreenstone.getBinScriptDirectoryPath() + filename;
             args[1] = "-xml";
             args[2] = "-language";

trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataPrompt.java

@@ -40 +40 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.cdm.Argument;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
@@ -238 +239 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "explode_metadata_database.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "explode_metadata_database.pl");
     command_parts_list.add("-plugin");
     command_parts_list.add(plugin_name);

trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.shell.GShell;
@@ -288 +289 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "export.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "export.pl");
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -296 +297 @@
     command_parts_list.add(export_type);
     command_parts_list.add("-exportdir");
-    command_parts_list.add(Configuration.getTmpDirectoryPath());
+    command_parts_list.add(LocalGreenstone.getTmpDirectoryPath());
 
     if (cd_title.equals("")) {
@@ -344 +345 @@
     args[0] = coll_names.toString();
 
-    args[1] = Configuration.getTmpDirectoryPath();
+    args[1] = LocalGreenstone.getTmpDirectoryPath();
     if(cd_title.equals("")) {
         String export_type = (String)saveas_combobox.getSelectedItem();

trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.shell.GShell;
@@ -256 +257 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(Configuration.getScriptPath() + "exportcol.pl");
+    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "exportcol.pl");
 
     if (Gatherer.isGsdlRemote) {
@@ -318 +319 @@
     
     args[0] = coll_names.toString();
-    args[1] = Configuration.getTmpDirectoryPath();
+    args[1] = LocalGreenstone.getTmpDirectoryPath();
     if(cd_title.equals("")) {
         args[1] += "exported_collections";