Changeset 6622 for trunk/gli/src/org/greenstone/gatherer/Configuration.java

Timestamp:

2004-01-27T16:35:34+13:00 (20 years ago)

Author:

jmt12

Message:

More modifications to mirroring including testing for a valid version of Wget (and complaining if its missing or it is old) and rearranging buttons on the GProgressBar

File:

• trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (5 diffs)

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

@@ -102 +102 @@
     /** The screen size of the desktop the Gatherer will be displayed on. */
     public Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
+
+    /** If true, overrides the mirroring enabled setting in the config.xml file. */
+    private boolean mirroring_enabled = false;
     /** Collection level configuration (which in some cases overrides general configuration. */
     private Document collection_config;
@@ -112 +115 @@
     private int cache_hit = 0;
     private int cache_miss = 0;
+
+    private String wget_path = null;
+    private String wget_version_str = StaticStrings.NO_WGET_STR;
+
     public URL exec_address = null;
 
@@ -119 +126 @@
      * @param perl_path The path to the PERL executable, as a <strong>String</strong>.
      */
-    public Configuration(String gsdl_path, String exec_path, String perl_path) {
+    public Configuration(String gsdl_path, String exec_path, String perl_path, boolean mirroring_enabled, String wget_version_str, String wget_path) {
     super();
     this.gsdl_path = gsdl_path;
     this.exec_path = exec_path;
+    this.mirroring_enabled = mirroring_enabled;
+    this.wget_version_str = wget_version_str;
+    this.wget_path = wget_path;
+
     // The exec_path may contain an url address, in which case we blindly use that and leave it up to the user to worry about settings and resetting.
     Gatherer.println("EXEC_PATH = " + exec_path);
@@ -256 +267 @@
     /** The default get action retrieves the named property from the desired configuration, and returns a true or false. */
     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"));
@@ -574 +588 @@
 
     public String getWGetPath() {
-    return "/usr/bin/wget";
+    return wget_path;
+    }
+
+    public String getWGetVersion() {
+    return wget_version_str;
     }