Changeset 29982 for branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl

Timestamp:

Dec 8, 2010, 7:21:36 PM (16 years ago)

Author:

watersc1

Message:

rtbt works in test case up through auto-chip-queue

File:

• branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl (modified) (4 diffs)

branches/czw_branch/20101203/ippScripts/scripts/register_imfile.pl

@@ -19 +19 @@
 use File::Basename qw( basename);
 use IPC::Run;
-use IPC::Cmd 0.36 qw( can_run );
+use IPC::Cmd 0.36 qw( can_run run );
 use PS::IPP::Config 1.01 qw( :standard );
+use PS::IPP::Metadata::List qw( parse_md_list );
 use PS::IPP::Metadata::Config;
 use Math::Trig;
@@ -179 +180 @@
 $command .= " $cmdflags";
 
+print "$command\n";
 # determine solar-system parameters
 my $longitude = &value_for_flag($cmdflags, 0.0, "-longitude");
@@ -235 +237 @@
 
 { 
+    my $mdcParser  = PS::IPP::Metadata::Config->new;
+
+    my $class_id   = &value_for_flag($cmdflags, 0.0, "-class_id");
+    my $check_date       = &value_for_flag($cmdflags, 0.0, "-dateobs");
+    $check_date =~ s/T.*$//;
+    my $exp_name   = $tmp_exp_name;
+    
+
     my $bt_check_command = "$regtool -checkburntoolimfile ";
-    $bt_check_command = " -class_id $class_id ";
-    $bt_check_command = " -date $date ";
-    $bt_check_command = " -exp_name $exp_name ";
-    $bt_check_command = " -dbname $dbname" if defined $dbname;
-
-    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    $bt_check_command .= " -class_id $class_id ";
+    $bt_check_command .= " -date $check_date ";
+    $bt_check_command .= " -valid_burntool $burntoolStateGood ";
+    $bt_check_command .= " -exp_name $exp_name ";
+    $bt_check_command .= " -dbname $dbname" if defined $dbname;
+
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run ( command => $bt_check_command, verbose => $verbose);
     unless ($success) {
@@ -270 +281 @@
     
     my $regtool_update = "$regtool -updateprocessedimfile ";
-    $regtool_update .= "-dbname $dbname" if defined $dbname;
+    $regtool_update .= "-dbname $dbname " if defined $dbname;
     $regtool_update .= "-exp_id $exp_id -class_id $class_id ";
 
     my $burntool_data = pop(@{ $exposures });
     if ($burntool_data->{burnable} == 0) {
-        $regtool_update .= " -burntool_state 0 -data_state pending_burntool ";
+        $regtool_update .= " -burntool_state 0 -set_state pending_burntool ";
     }
     else {
         my $apply_command = "$ippApplyBurntoolSingle --dbname $dbname ";
         $apply_command .= " --class_id $class_id --exp_id $exp_id ";
-        $apply_command .= " --this_uri $burntool_data->{this_uri} ";
+        $apply_command .= " --this_uri $burntool_data->{uri} ";
         $apply_command .= " --previous_uri $burntool_data->{previous_uri} " if defined $burntool_data->{previous_uri};
         $apply_command .= " --imfile_state $burntool_data->{imfile_state} ";
         $apply_command .= " --verbose " if $verbose;
+        print "$apply_command\n";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             IPC::Cmd::run(command => $apply_command, verbose => $verbose);