Changeset 10891

Timestamp:

2005-11-14T14:30:03+13:00 (18 years ago)

Author:

kjdon

Message:

when parsing options, once something has been set in , then don't override it with a superclass option. what was happening was that when processing the option lists (and setting default values for options that weren't specified by user) any superclass args were overriding the subclass args. eg. PSPlug, convert_to default is text, COnvertToPlug default is auto, so self->convert_to was getting set to text, then to auto. once its set to text, then we ignore any other defaults.

File:

• trunk/gsdl/perllib/parse2.pm (modified) (4 diffs)

trunk/gsdl/perllib/parse2.pm

@@ -286 +286 @@
     {
     my $strArgName = $hashOneArg->{"name"};
-    
+
     # If the strArgName has defined in the %hashInputArg, 
     # this means users has give this argument, store the 
@@ -292 +292 @@
     if(defined $hashInputArg{$strArgName})
     {
-        if(defined $hashOneArg->{"range"})
+        if(defined $hashOneArg->{"range"}) 
         {
         if(checkRange($hashOneArg->{"range"},$hashInputArg{$strArgName},$strArgName) == 0){ return 0;}
@@ -302 +302 @@
         $self->{"$strArgName"} = $hashInputArg{"$strArgName"};
     }
-
-    # Else use the default value of the arguments, 
-    # if there is no default value, then it must be a flag, 
-    # then set it to 0 (which is false)
-    else
-    {
+    elsif (!defined $self->{$strArgName}) 
+    {
+        # don't want to override default with superclass value
+      
+        # Else use the default value of the arguments, 
+        # if there is no default value, then it must be a flag, 
+        # then set it to 0 (which is false)
+    
         if(defined $hashOneArg->{"deft"})
         {
@@ -314 +316 @@
         else
         {
-        if($hashOneArg->{"type"} eq "flag"){ $self->{"$strArgName"} = 0;}
-        elsif($hashOneArg->{"type"} eq "string"){ $self->{"$strArgName"} = "";}
-        elsif($hashOneArg->{"type"} eq "int"){ $self->{"$strArgName"} = "";}
-        elsif($hashOneArg->{"type"} eq "enum"){ $self->{"$strArgName"} = "";}
-        elsif($hashOneArg->{"type"} eq "metadata"){ $self->{"$strArgName"} = "";}
-        else{die "other type without default value:$hashOneArg->{\"type\"}\n";}
-        }
-    }
-    
+        if($hashOneArg->{"type"} eq "flag"){ 
+            $self->{"$strArgName"} = 0;
+        }
+        else {
+            # all other cases, use "" as default
+            $self->{"$strArgName"} = "";
+        }
+        }
+    }
     }