Changeset 28003 for branches/pap/ippScripts/scripts/register_imfile.pl

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

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

branches/pap/ippScripts/scripts/register_imfile.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -115 +116 @@
     my $burntoolStateGood = 0;
     foreach my $line (split /\n/, $out1) {
-        if ($line =~ /FPA.BURNTOOL.APPLIED/) {
-            $line =~ s/^\s+//;
-            $burntoolState = (split /\s+/, $line)[2];
-        }
-        if ($line =~ /FPA.CAMERA/) {
-            $line =~ s/^\s+//;
-            if ((split /\s+/, $line)[2] eq 'GPC1') {
-                $isGPC1 = 1;
-            }
-        }
+        if ($line =~ /FPA.BURNTOOL.APPLIED/) {
+            $line =~ s/^\s+//;
+            $burntoolState = (split /\s+/, $line)[2];
+        }
+        if ($line =~ /FPA.CAMERA/) {
+            $line =~ s/^\s+//;
+            if ((split /\s+/, $line)[2] eq 'GPC1') {
+                $isGPC1 = 1;
+            }
+        }
     }
     if ($isGPC1 != 1) {
-        $burntoolState = 0; # If it's not GPC1, you shouldn't have run burntool.
+        $burntoolState = 0; # If it's not GPC1, you shouldn't have run burntool.
     }
     elsif (($isGPC1 == 1) && ($burntoolState == 1)) {
-#       print STDERR "In the good region: >>$burntoolState<<\n";
-        my $ppConfigDump_cmd = "$ppConfigDump -camera GPC1 -dump-camera -";
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            IPC::Cmd::run(command => $ppConfigDump_cmd, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            warn ("Unable to perform ppConfigDump");
-            exit($error_code);
-        }
-
-        # This is ugly, but doing a full parse for one entry is a bit wasteful.
-        foreach my $line (split /\n/, (join "", @$stdout_buf)) {
-            if ($line =~ /BURNTOOL.STATE.GOOD/) {
-                $line =~ s/^\s+//;
-                $burntoolStateGood = (split /\s+/, $line)[2];
-                last;
-            }
-        }
-        $burntoolState = $burntoolStateGood; # Positive because this has the header table.
-        
+#       print STDERR "In the good region: >>$burntoolState<<\n";
+        my $ppConfigDump_cmd = "$ppConfigDump -camera GPC1 -dump-camera -";
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            IPC::Cmd::run(command => $ppConfigDump_cmd, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            warn ("Unable to perform ppConfigDump");
+            exit($error_code);
+        }
+
+        # This is ugly, but doing a full parse for one entry is a bit wasteful.
+        foreach my $line (split /\n/, (join "", @$stdout_buf)) {
+            if ($line =~ /BURNTOOL.STATE.GOOD/) {
+                $line =~ s/^\s+//;
+                $burntoolStateGood = (split /\s+/, $line)[2];
+                last;
+            }
+        }
+        $burntoolState = $burntoolStateGood; # Positive because this has the header table.
+
     }
     $cmdflags .= " -burntool_state $burntoolState ";
@@ -173 +174 @@
 $command .= " -hostname $host" if defined $host;
 $command .= " -dbname $dbname" if defined $dbname;
+$command .= " -data_state full";
 $command .= " $cmdflags";