Changeset 8626

Timestamp:

2004-11-23T13:35:05+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the now-redundant "-mirror" option.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (5 diffs)
• Gatherer.java (modified) (4 diffs)
• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• GetOpt.java (modified) (2 diffs)
• gems/GEMS.java (modified) (1 diff)
• util/StaticStrings.java (modified) (1 diff)

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

@@ -113 +113 @@
     /** The servlet path if we are using GS3 */
     static public String servlet_path = "";
-    /** If true, overrides the mirroring enabled setting in the config.xml file. */
-    static private boolean mirroring_enabled = false;
     /** Collection level configuration (which in some cases overrides general configuration. */
     static private Document collection_config;
     /** The general configuration settings. */
     static private Document general_config;
-    
+
     /** The element, from glis config file, that contains the various directory mappings. */
     static private Element directory_mappings_element;
@@ -135 +133 @@
      * @param library_url A <strong>String</strong> containing the url of the Greenstone webserver.
      * @param perl_path The path to the PERL executable, as a <strong>String</strong>.
-     * @param mirroring_enabled If true will override the config.xml fiel setting for mirroring.
      * @param site_name The name of the Greenstone 3 site currently in use.
      */
-    public Configuration(String gsdl_path, String gsdl3_path, String library_url, String perl_path, boolean mirroring_enabled, String site_name) {
+    public Configuration(String gsdl_path, String gsdl3_path, String library_url, String perl_path, String site_name)
+    {
     super();
     self = this;
@@ -144 +142 @@
     this.gsdl_path = gsdl_path;
     this.gsdl3_path = gsdl3_path;
-    this.mirroring_enabled = mirroring_enabled;
     this.site_name = site_name;
 
@@ -166 +163 @@
     }
 
-    // Try to reload the configuration. The first place we look is the user specific location
-    String config_xml_name = CONFIG_XML;
+    // Try to load the configuration file, first looking in the user specific location
+    String config_xml_file_name = CONFIG_XML;
     if (gsdl3_path != null) {
-        config_xml_name = GS3_CONFIG_XML;
-    }
-    File config_xml = new File(Utility.getGLIUserFolder(), config_xml_name);
-    if(config_xml != null && config_xml.exists()) {
-        general_config = Utility.parse(config_xml.getAbsolutePath(), false);
+        config_xml_file_name = GS3_CONFIG_XML;
+    }
+    File config_xml_file = new File(Utility.getGLIUserFolder(), config_xml_file_name);
+    if (config_xml_file != null && config_xml_file.exists()) {
+        general_config = Utility.parse(config_xml_file.getAbsolutePath(), false);
     }
 
     // We then try within the gli directory itself
-    if(general_config == null) {
-        config_xml = new File(config_xml_name);
-        if(config_xml.exists()) {
-        general_config = Utility.parse(config_xml_name, true);
+    if (general_config == null) {
+        config_xml_file = new File(config_xml_file_name);
+        if (config_xml_file.exists()) {
+        general_config = Utility.parse(config_xml_file_name, true);
         }
     }
 
     // Check the version of the config we have loaded, and if it isn't recent enough, backup the old version, and then create a new config.
-    if(general_config != null) {
+    if (general_config != null) {
         Element configuration_element = general_config.getDocumentElement();
         String configuration_version = configuration_element.getAttribute(StaticStrings.VERSION_ATTRIBUTE);
-        if(!configuration_version.equals(CURRENT_CONFIGURATION_VERSION)) {
-        /** @todo - reenable this once we can change the dictionary. */
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Configuration.Obsolete_Config"), Dictionary.get("Configuration.Obsolete_Config_Title"), JOptionPane.ERROR_MESSAGE);
+        if (!configuration_version.equals(CURRENT_CONFIGURATION_VERSION)) {
+        // !!! JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Configuration.Obsolete_Config"), Dictionary.get("Configuration.Obsolete_Config_Title"), JOptionPane.ERROR_MESSAGE);
+        File backup = new File(config_xml_file.getAbsolutePath() + ".bak");
+        config_xml_file.renameTo(backup);
         general_config = null;
-        configuration_element = null;
-        File backup = new File(config_xml.getAbsolutePath() + ".bak");
-        config_xml.renameTo(backup);
-        backup = null;
-        }
-        else {
-        configuration_element = null;
-        }
-        configuration_version = null;
-    }
-
-    // And if that fails retrieve the default configuration file from our xml library, which I'll personally guarantee to work.
-    if(general_config == null) {
+        }
+    }
+
+    // And if that fails retrieve the default configuration file from our xml library
+    if (general_config == null) {
         general_config = Utility.parse(TEMPLATE_CONFIG_XML, true);
-        DebugStream.println("Loaded default Gatherer configuration template.");
-    }
-    else {
-        DebugStream.println("Loaded current Gatherer configuration.");
     }
 
@@ -287 +273 @@
     /** The default get action retrieves the named property from the desired configuration, and returns a true or false. */
     static public boolean get(String property, boolean general) {
-    if(general && mirroring_enabled && property.equals(StaticStrings.WORKFLOW_MIRROR)) {
-        return mirroring_enabled;
-    }
     String raw = getString(property, general);
     return (raw != null && raw.equalsIgnoreCase("true"));

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

@@ -121 +121 @@
                boolean no_load, String open_collection, 
                String site_name, String servlet_path, 
-               boolean mirroring_enabled, String wget_version_str, 
-               String wget_path) 
+               String wget_version_str, String wget_path) 
     {
     // This will hopefully catch ctrl-c and terminate, and exit gracefully. However it is platform specific, and may not be supported by some JVMs.
@@ -153 +152 @@
     try {
         // Load Config
-        loadConfig(gsdl_path, gsdl3_path, library_url, perl_path, mirroring_enabled, site_name);
+        loadConfig(gsdl_path, gsdl3_path, library_url, perl_path, site_name);
 
         // I don't really know what this is for but I've moved it here from Configuration
@@ -611 +610 @@
      * @param library_url The path to the library executable, gathered from the startup arguments, and presented as a <strong>String</strong>.
      * @param perl_path The path to the PERL compiler as a <strong>String</strong>. Necessary for windows platform versions.
-     * @param mirroring_enabled
-     * @param wget_version_str
-     * @param wget_path
      * @see java.io.FileInputStream
      * @see java.io.ObjectInputStream
@@ -619 +615 @@
      * @see org.greenstone.gatherer.Configuration
      */
-    private void loadConfig(String gsdl_path, String gsdl3_path, String library_url, String perl_path, boolean mirroring_enabled, String site_name) {
+    private void loadConfig(String gsdl_path, String gsdl3_path, String library_url, String perl_path, String site_name) {
     try {
-        new Configuration(gsdl_path, gsdl3_path, library_url, perl_path, mirroring_enabled, site_name);
+        new Configuration(gsdl_path, gsdl3_path, library_url, perl_path, site_name);
     }
     catch (Exception error) {

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

@@ -174 +174 @@
                     go.library_url, go.debug, go.perl_path, 
                     go.no_load, go.filename, go.site_name, 
-                    go.servlet_path, go.mirroring_enabled, 
-                    go.wget_version_str, go.wget_path);
+                    go.servlet_path, go.wget_version_str, go.wget_path);
 
 

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

@@ -93 +93 @@
                  go.library_url, go.debug, go.perl_path, 
                  go.no_load, go.filename, go.site_name, 
-                 go.servlet_path, go.mirroring_enabled, 
-                 go.wget_version_str, go.wget_path);
+                 go.servlet_path, go.wget_version_str, go.wget_path);
     gatherer.run(size,splash,g_man);
     }

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

@@ -36 +36 @@
     public boolean debug = false; 
     public boolean feedback_enabled = false;
-    public boolean mirroring_enabled = false;
     public boolean no_load = false;
 
@@ -134 +133 @@
             filename = null;
             }
-            // Run the GLI with mirroring enabled
-            else if(argument_name.equals(StaticStrings.MIRROR_ARGUMENT)) {
-            mirroring_enabled = true;
-            }
             /* I've got a sneak suspicion Aqua look and feel is not free domain
             // Specify the use of Greenstone LAF.

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -190 +190 @@
     try {
            
-        config = new Configuration(go.gsdl_path, null, null, go.perl_path, false, null);
+        config = new Configuration(go.gsdl_path, null, null, go.perl_path, null);
     }
     catch (Exception exception) {

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -172 +172 @@
     static final public String MGPP_ATTRIBUTE                             = "mgpp_enabled";
     static final public String MINUS_CHARACTER                            = "-";
-    static final public String MIRROR_ARGUMENT                            = "-mirror";
     static final public String MODE_STR                                   = "Mode: ";
     static final public String MODEGLI_ELEMENT                            = "ModeGLI";