Changeset 42394 for trunk/ippScripts/scripts/dist_bundle.pl

Timestamp:

Feb 14, 2023, 12:59:01 PM (3 years ago)

Author:

tdeboer

Message:

burntool handling/parsing updates

File:

• trunk/ippScripts/scripts/dist_bundle.pl (modified) (5 diffs)

trunk/ippScripts/scripts/dist_bundle.pl

@@ -75 +75 @@
 my $file_cmd   = can_run('file') or (warn "can't find program file" and $missing_tools = 1);
 my $zcat   = can_run('zcat') or (warn "can't find program zcat" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -131 +132 @@
 }
 
+# Determine the value of a "good" burntool run.
+my $config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD";
+my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    run ( command => $config_cmd, verbose => $verbose);
+unless ($success) {
+    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+    &my_die("Unable to perform ppConfigDump: $error_code", 0, 0, $class_id, $PS_EXIT_SYS_ERROR);
+}
+
+my $recipeData = $mdcParser->parse(join "", @$stdout_buf) or
+    &my_die("Unable to parse metadata config doc", 0, 0, $class_id, $PS_EXIT_SYS_ERROR);
+
+my $burntoolStateGood = 999;
+foreach my $cfg (@$recipeData) {
+    if ($cfg->{name} eq 'BURNTOOL.STATE.GOOD') {
+        $burntoolStateGood = $cfg->{value};
+    }
+}
+if ($burntoolStateGood == 999) {
+    &my_die("Failed to determine BURNTOOL.STATE.GOOD", $burntoolStateGood, $class_id, 0, $PS_EXIT_SYS_ERROR);
+}
+
+
 $ipprc->redirect_output($logfile) if $logfile;
 
@@ -144 +168 @@
 # note: We my_die in get_file_list if something goes wrong.
 
-my $file_list = get_file_list($stage, $component, $path_base, $clean, $num_sky_inputs);
+my $file_list = get_file_list($stage, $component, $path_base, $clean, $num_sky_inputs,$burntoolStateGood);
 
 if (($stage ne 'raw') and ($stage ne 'fake') and ($stage ne 'stack_summary') and !$poor_quality) {
@@ -555 +579 @@
     my $clean = shift;
     my $num_sky_inputs = shift;
+    my $bt_state_good = shift;
 
     my @file_list;
@@ -576 +601 @@
                 my %burntool_table;
                 $burntool_table{file_rule} = "BURNTOOL.TABLE";
-                $burntool_table{name} = "$path_base.burn.tbl";
+                
+                if($bt_state_good == 15) {
+                    $burntool_table{name} = "$path_base.burn.v15.tbl";  
+                } else {
+                    $burntool_table{name} = "$path_base.burn.tbl";              
+                }               
                 push @file_list, \%burntool_table;
             }