Changeset 16464

Timestamp:

2008-07-18T15:29:15+12:00 (16 years ago)

Author:

ak19

Message:

FEDORA_VERSION has become the secondary environment variable when running FLI. It has replaced FEDORA2_HOME/FEDORA3_HOME.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• FedoraInfo.java (modified) (3 diffs)
• GetOpt.java (modified) (2 diffs)

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

@@ -35 +35 @@
 public class FedoraInfo 
 {
+    public static final int minimumSupportedMajorVersion = 2;
+
     private boolean active = false;
     private String home = null;
+    private String version = null;
 
     private String hostname = null;
@@ -63 +66 @@
     }
 
+    // Called when an environment variable was wrongly set for running Fedora
+    public void deactivate(String errorMessage) {
+    this.active = false;
+    // display an errormessage and exit cleanly
+    System.err.println(errorMessage);
+    Gatherer.exit();
+    }
+
     public boolean isActive()
     {
-    return (home != null || active);
+    return active;
     }
 
@@ -79 +90 @@
     }
 
+    public void setVersion(String version)
+    {
+    String firstChar = version.substring(0, 1);
+    if(!Character.isDigit(version.charAt(0))) { // version is illegal if it does not begin with a number
+        deactivate("Incorrect format for major version: " + version + ". The Fedora version must start with a number.");
+    }
+    else if(Integer.parseInt(firstChar) < minimumSupportedMajorVersion) { 
+        // major version number of Fedora must be more than this
+        deactivate("The major version number of Fedora must be at least " +  minimumSupportedMajorVersion + ".");
+    }
+    else { // acceptable
+        this.version = version;
+    } 
+    }
+
+
+    public String getVersion()
+    {
+    return version;
+    }
 
     public void setHostname(String hostname)

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

@@ -254 +254 @@
             // Fedora home - when running Fedora locally
             if(argument_name.equals(StaticStrings.FEDORA_HOME)) {
-            fedora_info.setActive(true);
-
             if(argument_value.endsWith(File.separator)) {
                 fedora_info.setHome(argument_value);
@@ -264 +262 @@
             }
 
+            if(argument_name.equals(StaticStrings.FEDORA_VERSION)) {
+            fedora_info.setVersion(argument_value);
+            }
+            
             // Fedora hostname
             if(argument_name.equals(StaticStrings.FEDORA_HOSTNAME)) {