Changeset 31919 for main/trunk/greenstone2

Timestamp:

2017-08-24T12:34:30+12:00 (7 years ago)

Author:

kjdon

Message:

small tidy up to parsing. remove - if there, but allow the arg to not have -. Don't put the - back on to the extra arg as it will probably be the collection name.

File:

• main/trunk/greenstone2/perllib/parse2.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/parse2.pm

@@ -275 +275 @@
         # If it is start with a "-" sign then take it off
         $strOneArg =~ s/^-+//;
-
+    }
         # If the inputed argument is defined in the argument 
         # list from this plugin then process
@@ -296 +296 @@
         if($blnAllowExtraOptions eq "true")
         {
-            push(@ExtraOption,"-$strOneArg");
+            push(@ExtraOption,"$strOneArg");
         }
         else
         {
             print STDERR "<BadArgument a=$strOneArg>\n";
-            print STDERR " Error: occur in parse2.pm::parse()\n Extra Arguments: $strOneArg\n";
+            print STDERR " Error: occur in parse2.pm::parse()\n Invalid Argument: $strOneArg\n";
             return -1;
         }
         }
-    }
-    
-    # This part follow the previous parsing system. 
-    # It doesn't return error message even user
-    # gave a invalid argument.
-    else
-    {
-        if($blnAllowExtraOptions eq "true")
-        {
-        push(@ExtraOption,$strOneArg);
-        }
-        else
-        {
-        print STDERR " Error: occur in parse2.pm::parse()\n Invalid Argument: $strOneArg\n";
-        return -1;
-        }
-    }
     }