Changeset 18363 for gli/branches/rtl-gli/src/org/greenstone/gatherer/GetOpt.java

Timestamp:

2009-01-12T11:19:54+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/GetOpt.java (modified) (4 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/GetOpt.java

@@ -55 +55 @@
     public String metadata_path = null;
 
+    protected FedoraInfo fedora_info = null;
+    
     public GetOpt(String[] args)
     {
     // Default dictionary. Only used for starting error messages.
     Dictionary dictionary = new Dictionary(null, null); 
+
+    fedora_info = new FedoraInfo();
 
     // Parse arguments
@@ -142 +146 @@
             use_remote_greenstone = true;
             //Use a remote Greenstone
-        
-            }else if (argument_name.equals(StaticStrings.GSDL3_ARGUMENT)){
+            }
+            else if (argument_name.equals(StaticStrings.GSDL3_ARGUMENT)){
             //Use a remote Greenstone3
             run_gsdl3=true;
@@ -149 +153 @@
             else if (argument_name.equals(StaticStrings.NEW_METADATASET)) {
             new_set = true;
+            }
+            else if(argument_name.equals(StaticStrings.FEDORA_MODE)) {
+            // Running FLI remotely
+            fedora_info.setActive(true);
             }
         }
@@ -243 +251 @@
             }
             }
+
+            // Fedora home - when running Fedora locally
+            if(argument_name.equals(StaticStrings.FEDORA_HOME)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setHome(argument_value);
+            }
+            else {
+                fedora_info.setHome(argument_value + File.separator);
+            }
+            }
+
+            if(argument_name.equals(StaticStrings.FEDORA_VERSION)) {
+            fedora_info.setVersion(argument_value);
+            }
+            
+            // Fedora hostname
+            if(argument_name.equals(StaticStrings.FEDORA_HOSTNAME)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setHostname(argument_value);
+            }
+            else {
+                fedora_info.setHostname(argument_value + File.separator);
+            }
+            }
+            // Fedora port
+            if(argument_name.equals(StaticStrings.FEDORA_PORT)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setPort(argument_value);
+            }
+            else {
+                fedora_info.setPort(argument_value + File.separator);
+            }
+            }
+            // Fedora username
+            if(argument_name.equals(StaticStrings.FEDORA_USERNAME)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setUsername(argument_value);
+            }
+            else {
+                fedora_info.setUsername(argument_value + File.separator);
+            }
+            }
+            // Fedora password
+            if(argument_name.equals(StaticStrings.FEDORA_PASSWORD)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setPassword(argument_value);
+            }
+            else {
+                fedora_info.setPassword(argument_value + File.separator);
+            }
+            }
+            // Fedora protocol, e.g. http or https
+            if(argument_name.equals(StaticStrings.FEDORA_PROTOCOL)) {
+            if(argument_value.endsWith(File.separator)) {
+                fedora_info.setProtocol(argument_value);
+            }
+            else {
+                fedora_info.setProtocol(argument_value + File.separator);
+            }
+            }
+
+
+
+
                   
         }