Changeset 5031

Timestamp:

2003-07-25T16:24:53+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed some of the horrible tabbing, and tried to figure out, unsucessfully I might add, why -no_load is being ignored.

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -466 +466 @@
         // 2. If we now have an argument name we continue by attempting to parse a value. A value is taken to be the sequence of space seperated Strings between the last argument name and up to but not including the next argument name. Of course an argument needn't have any value (ie -debug, -help), in which case value will be null.
         if(argument_name != null) {
-            String argument_value = null;
-            StringBuffer argument_value_buffer = new StringBuffer("");
-            while(argument_index < args.length && next_token == null) {
-                next_token = args[argument_index];
-                argument_index++;
-                // If we just parsed an arbitary String then append it to value, followed by a single space
-                if(!next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
-                    argument_value_buffer.append(next_token);
-                    argument_value_buffer.append(StaticStrings.SPACE_CHARACTER);
-                    next_token = null;
-                }
-                // If the argument token retrieved is an argument name, then leave it in next_token, which will cause the argument parsing process to move onto the next step.
+            String argument_value = null;
+            StringBuffer argument_value_buffer = new StringBuffer("");
+            while(argument_index < args.length && next_token == null) {
+            next_token = args[argument_index];
+            argument_index++;
+                // If we just parsed an arbitary String then append it to value, followed by a single space
+            if(!next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
+                argument_value_buffer.append(next_token);
+                argument_value_buffer.append(StaticStrings.SPACE_CHARACTER);
+                next_token = null;
             }
-            // If a value now exists in argument buffer, retrieve it. Remove the last character as it will be an erroneous space.
-            if(argument_value_buffer.length() > 0) {
-                argument_value = argument_value_buffer.substring(0, argument_value_buffer.length() - 1);
-            }
-
-            // 3. We now have the argument name, and any associated value. We are ready to store the data in the appropriate variables.
-            Gatherer.println("Parsed Argument: name=" + argument_name + (argument_value != null ? (", value=" + argument_value) : ", no value"));
-            // 3a. First those arguments that have no associated value
-            if(argument_value == null) {
-                if(argument_name.equals(StaticStrings.HELP_ARGUMENT)) {
-                    printUsage(dictionary);
-                    System.exit(0);
+                // If the argument token retrieved is an argument name, then leave it in next_token, which will cause the argument parsing process to move onto the next step.
+            }
+            // If a value now exists in argument buffer, retrieve it. Remove the last character as it will be an erroneous space.
+            if(argument_value_buffer.length() > 0) {
+            argument_value = argument_value_buffer.substring(0, argument_value_buffer.length() - 1);
+            }
+            
+            // 3. We now have the argument name, and any associated value. We are ready to store the data in the appropriate variables.
+            Gatherer.println("Parsed Argument: name=" + argument_name + (argument_value != null ? (", value=" + argument_value) : ", no value"));
+            // 3a. First those arguments that have no associated value
+            if(argument_value == null) {
+            if(argument_name.equals(StaticStrings.HELP_ARGUMENT)) {
+                printUsage(dictionary);
+                System.exit(0);
                 }
                 // Run GLI in debug mode. Produces debug log plus extra messages.
                 else if(argument_name.equals(StaticStrings.DEBUG_ARGUMENT)) {
-                    debug = true;
+                debug = true;
                 }
-                // Forces no loading on previous collection.
-                else if(argument_name.equals(StaticStrings.NO_LOAD_ARGUMENT)) {
-                    no_load = true;
-                    filename = null;
+            // Forces no loading on previous collection.
+            else if(argument_name.equals(StaticStrings.NO_LOAD_ARGUMENT)) {
+                no_load = true;
+                filename = null;
+            }
+            // Specify the use of Greenstone LAF.
+            else if(argument_name.equals(StaticStrings.SKIN_ARGUMENT)) {
+                // SkinLF
+                try {
+                SkinLookAndFeel.setSkin(SkinLookAndFeel.loadThemePackDefinition(SkinUtils.toURL(new File(SKIN_DEFINITION_FILE))));
+                SkinLookAndFeel.enable();
                 }
-                // Specify the use of Greenstone LAF.
-                else if(argument_name.equals(StaticStrings.SKIN_ARGUMENT)) {
-                    // SkinLF
-                    try {
-                        SkinLookAndFeel.setSkin(SkinLookAndFeel.loadThemePackDefinition(SkinUtils.toURL(new File(SKIN_DEFINITION_FILE))));
-                        SkinLookAndFeel.enable();
-                    }
-                    catch (Exception error) {
-                        ///ystem.err.println("Error: " + error);
-                        error.printStackTrace();
-                    }
+                catch (Exception error) {
+                ///ystem.err.println("Error: " + error);
+                error.printStackTrace();
+                }
                 }
-            }
-            // 3b. Now for those that do
-            else {
-                // Parse the path to the GSDL. Required argument.
+            }
+            // 3b. Now for those that do
+            else {
+            // Parse the path to the GSDL. Required argument.
                 if(argument_name.equals(StaticStrings.GSDL_ARGUMENT)) {
-                    if(argument_value.endsWith(File.separator)) {
-                        gsdl_path = argument_value;
-                    }
-                    else {
-                        gsdl_path = argument_value + File.separator;
-                    }
+                if(argument_value.endsWith(File.separator)) {
+                gsdl_path = argument_value;
+                }
+                else {
+                gsdl_path = argument_value + File.separator;
+                }
                 }
-                // Specify a collection to load initially. Could be used for file associations.
+            // Specify a collection to load initially. Could be used for file associations.
                 else if(argument_name.equals(StaticStrings.LOAD_ARGUMENT)) {
-                    filename = argument_value;
-                    no_load = false;
+                filename = argument_value;
+                no_load = false;
                 }
-                // Parse the url to a running web server, or a file path to the local library server.
+            // Parse the url to a running web server, or a file path to the local library server.
                 else if(argument_name.equals(StaticStrings.LIBRARY_ARGUMENT)) {
                     exec_path = argument_value;