Changeset 23540

Timestamp:

Mar 25, 2009, 6:55:57 PM (17 years ago)

Author:

eugene

Message:

add default response to value_for_flag; check for NULL for the required strings (numerical cond test fails on valid string)

File:

• trunk/ippScripts/scripts/register_imfile.pl (modified) (3 diffs)

trunk/ippScripts/scripts/register_imfile.pl

@@ -112 +112 @@
 
 # we require at a minimum: -telescope, -inst, -filelevel, -class_id, -exp_type
-if (uc(&value_for_flag ($cmdflags, "-telescope")) == 0) { &my_die ("telescope not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
-if (uc(&value_for_flag ($cmdflags, "-inst"))      == 0) { &my_die ("inst      not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
-if (uc(&value_for_flag ($cmdflags, "-filelevel")) == 0) { &my_die ("filelevel not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
-if (uc(&value_for_flag ($cmdflags, "-class_id"))  == 0) { &my_die ("class_id  not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
-if (uc(&value_for_flag ($cmdflags, "-exp_type"))  == 0) { &my_die ("exp_type  not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
+if (uc(&value_for_flag ($cmdflags, "NULL", "-telescope")) eq "NULL") { &my_die ("telescope not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
+if (uc(&value_for_flag ($cmdflags, "NULL", "-inst"))      eq "NULL") { &my_die ("inst      not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
+if (uc(&value_for_flag ($cmdflags, "NULL", "-filelevel")) eq "NULL") { &my_die ("filelevel not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
+if (uc(&value_for_flag ($cmdflags, "NULL", "-class_id"))  eq "NULL") { &my_die ("class_id  not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
+if (uc(&value_for_flag ($cmdflags, "NULL", "-exp_type"))  eq "NULL") { &my_die ("exp_type  not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
 
 my $command = "$regtool -addprocessedimfile";
@@ -128 +128 @@
 
 # determine solar-system parameters
-my $longitude = &value_for_flag($cmdflags, "-longitude");
-my $latitude  = &value_for_flag($cmdflags, "-latitude");
-my $elevation = &value_for_flag($cmdflags, "-elevation");
-my $ra        = &value_for_flag($cmdflags, "-ra");
-my $dec       = &value_for_flag($cmdflags, "-decl");
-my $dateobs   = &value_for_flag($cmdflags, "-dateobs");
+my $longitude = &value_for_flag($cmdflags, 0.0, "-longitude");
+my $latitude  = &value_for_flag($cmdflags, 0.0, "-latitude");
+my $elevation = &value_for_flag($cmdflags, 0.0, "-elevation");
+my $ra        = &value_for_flag($cmdflags, 0.0, "-ra");
+my $dec       = &value_for_flag($cmdflags, 0.0, "-decl");
+my $dateobs   = &value_for_flag($cmdflags, 0.0, "-dateobs");
 
 # if the needed data is available, pass it to sunmoon:
@@ -193 +193 @@
 {
     my $cmdflags = shift;
+    my $default = shift;
     my $flag = shift;
 
-    my $value = 0.0;
+    my $value = $default;
     if ($cmdflags =~ m|$flag|) {
         ($value) = $cmdflags =~ m|$flag\s+(\S+)|;