Changeset 30912 for trunk/ippScripts/scripts/minidvodb_merge.pl

Timestamp:

Mar 15, 2011, 4:50:08 PM (15 years ago)

Author:

heather

Message:

addtool minidvodb verification added

File:

• trunk/ippScripts/scripts/minidvodb_merge.pl (modified) (8 diffs)

trunk/ippScripts/scripts/minidvodb_merge.pl

@@ -16 +16 @@
 my $dtime_relphot;
 my $dtime_merge;
+my $dtime_verify;
+my $dtime_script;
 
 use vars qw( $VERSION );
@@ -36 +38 @@
 my $relphot = can_run('relphot') or (warn "Can't find relphot" and $missing_tools = 1);
 my $relastro = can_run('relastro') or (warn "Can't find relastro" and $missing_tools = 1);
+my $dvoverify = can_run('dvoverify') or (warn "Can't find dvoverify" and $missing_tools = 1);
+
+
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -87 +92 @@
 unless ($no_op) {
     if (defined $mergedvodbReal) {
+
+        #this is chopped into several parts:  addstar, relphot, dvoverify, merge
+
+
+        #addstar
         {
             my $command  = "$addstar -resort";
@@ -105 +115 @@
             print "addstar -resort time $dtime_addstar\n";
         }
+
+        #relphot
 
         {
@@ -124 +136 @@
             print "relphot time $dtime_relphot\n";
         }
+        #dvoverify
+        {
+            my $command  = "$dvoverify -s $minidvodb";
+            print "$command\n";
+            my $mjd_dvoverify_start = DateTime->now->mjd;   # MJD of starting script
+
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                &my_die("Unable to perform dvoverify: $error_code", $mergedvodb, $error_code);
+            }
+            $dtime_dvoverify = 86400.0*(DateTime->now->mjd - $mjd_dvoverify_start);   # MJD of starting script
+            print "dvoverify time $dtime_dvoverify\n";
+        }
+
+
+        #Merge
 
         my $this_is_the_first;
@@ -190 +220 @@
 
         {
+
+            $dtime_script = 86400.0*(DateTime->now->mjd - $mjd_start);
+
+
             my $command = "addtool -minidvodb_id $minidvodb_id";
             $command .= " -addminidvodbprocessed";
@@ -197 +231 @@
             $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
             $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
-            $command .= " -dbname $dbname" if defined $dbname;
+            $command .= " -dtime_script $dtime_script" if defined $dtime_script;
+            $command .= " -dtime_verify $dtime_dvoverify" if defined $dtime_dvoverify;
+            $command .= " -dbname $dbname" if defined $dbname;
             #print $command;
 
@@ -236 +272 @@
         $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
         $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
+    $command .= " -dtime_script $dtime_script" if defined $dtime_script;
+    $command .= " -dtime_verify $dtime_dvoverify" if defined $dtime_dvoverify;
         $command .= " -dbname $dbname" if defined $dbname;