Index: trunk/ippScripts/scripts/minidvodb_merge.pl
===================================================================
--- trunk/ippScripts/scripts/minidvodb_merge.pl	(revision 28181)
+++ trunk/ippScripts/scripts/minidvodb_merge.pl	(revision 28211)
@@ -4,5 +4,5 @@
 use strict;
 use Carp;
-
+ 
 ## report the program and machine
 use Sys::Hostname;
@@ -90,8 +90,8 @@
             my $command  = "$addstar -resort";
             $command .= " -D CAMERA $camera";
-            $command .= " -D CATDIR $mergedvodbReal";
+            $command .= " -D CATDIR $minidvodb";
 
             my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
-
+	    print "\n$command\n";
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                 run(command => $command, verbose => $verbose);
@@ -102,4 +102,5 @@
             $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);  $dtime_resort = $dtime_addstar;
             # MJD of starting script
+	    $dtime_resort = $dtime_addstar;
             print "addstar -resort time $dtime_addstar\n";
         }
@@ -110,6 +111,6 @@
             my $command  = "$relphot -averages -update";
             $command .= " -D CAMERA $relphot_camera";
-            $command .= " -D CATDIR $mergedvodbReal";
-
+            $command .= " -D CATDIR $minidvodb";
+	    print "$command\n";
             my $mjd_relphot_start = DateTime->now->mjd;   # MJD of starting script
 
@@ -129,5 +130,5 @@
             my $mdcParser = PS::IPP::Metadata::Config->new;
 
-            my $command = "$addtool -listminidvodbrun -state mergedsdfsad -minidvodb_group " . $minidvodb_group;
+            my $command = "$addtool -listminidvodbrun -state merged -minidvodb_group " . $minidvodb_group;
             $command .= " -dbname $dbname" if defined $dbname;
 
@@ -152,28 +153,36 @@
             }
         }
+	{
+	    if (!-e "$mergedvodb/Image.dat") {
+		$this_is_the_first = 1; #the first time it copied maybe it failed? we want it to copy this time
+	
+	    }
+
+	}
 
         {
             my $merge_command;
+	    my $mjd_merge_start = DateTime->now->mjd;   # MJD of starting script
             if ($this_is_the_first) {
-                $merge_command = "cp -rp $minidvodb $mergedvodb"
-            } else {
-                $merge_command = "$dvomerge $minidvodb into $mergedvodb"
-            }
-
-            my $mjd_merge_start = DateTime->now->mjd;   # MJD of starting script
-
-            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $merge_command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to merge: $error_code", $mergedvodb, $error_code);
-            }
-
-            $dtime_merge = 86400.0*(DateTime->now->mjd - $mjd_merge_start);   # MJD of starting script
-            print "merge time $dtime_merge\n";
-        }
-
-
-        {
+		$merge_command = "cp -rp $minidvodb/* $mergedvodb";
+		print "$merge_command\n";
+	    } else {
+                $merge_command = "$dvomerge $minidvodb into $mergedvodb";
+	    }
+	    
+	    print "\n$merge_command\n";
+	    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+		run(command => $merge_command, verbose => $verbose);
+	    unless ($success) {
+		    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+		    &my_die("Unable to merge: $error_code", $mergedvodb, $error_code);
+	    }
+		
+	    $dtime_merge = 86400.0*(DateTime->now->mjd - $mjd_merge_start);   # MJD of starting script
+	    print "merge time $dtime_merge\n";
+#	}
+	}
+
+	{
             my $command = "addtool -minidvodb_id $minidvodb_id";
             $command .= " -addminidvodbprocessed";
@@ -181,6 +190,6 @@
             $command .= " -minidvodb_group $minidvodb_group";
             $command .= " -dtime_relphot $dtime_relphot"  if defined $dtime_relphot;
-            $command .= " -dtime_relphot $dtime_resort" if defined $dtime_resort;
-            $command .= " -dtime_relphot $dtime_merge" if defined $dtime_merge;
+            $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
+            $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
             $command .= " -dbname $dbname" if defined $dbname;
             #print $command;
@@ -220,6 +229,6 @@
         $command .= " -minidvodb_group $minidvodb_group";
         $command .= " -dtime_relphot $dtime_relphot" if defined $dtime_relphot;
-        $command .= " -dtime_relphot $dtime_resort" if defined $dtime_resort;
-        $command .= " -dtime_relphot $dtime_merge" if defined $dtime_merge;
+        $command .= " -dtime_resort $dtime_resort" if defined $dtime_resort;
+        $command .= " -dtime_merge $dtime_merge" if defined $dtime_merge;
         $command .= " -dbname $dbname" if defined $dbname;