Index: trunk/tools/stsci_disks/p4_restore.pl
===================================================================
--- trunk/tools/stsci_disks/p4_restore.pl	(revision 38683)
+++ trunk/tools/stsci_disks/p4_restore.pl	(revision 38684)
@@ -83,7 +83,7 @@
 
 
-# my $logDest = "neb://any/stsci_shuffle/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
-# my $ipprc = PS::IPP::Config->new( "GPC1" ) or die "Could not create config object.\n";
-# $ipprc->redirect_output($logDest) or die "Could not redirect output to logfile ${logDest}\n";
+my $logDest = "neb://any/stsci_shuffle/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+my $ipprc = PS::IPP::Config->new( "GPC1" ) or die "Could not create config object.\n";
+$ipprc->redirect_output($logDest) or die "Could not redirect output to logfile ${logDest}\n";
 
 my $root = "/export/${host}.${volume}/stsci_shuffle/${source}.${source_vol}/nebulous/${dir}";
@@ -142,8 +142,17 @@
 	if (-e $destination_f) {
 	    print "FILE ALREADY FOUND\n";
+	    next;
 	}
-	system("stat ${f}");
+
+	my $validate_ins_id_query = "SELECT * FROM instance WHERE vol_id = ${source_vol_id} AND ins_id = ${ins_id}";
+	my @instances = $dbh->selectall_arrayref( $validate_ins_id_query );
+	if ($#instances != 0) { # We expect one instance on the source
+	    print "NO DB ENTRY\n";
+	    next;
+	}
+#	print "PASSED DB CHECK: $#instances\n";
+#	system("stat ${f}");
 	system("mv ${f} ${destination_f}");
-	system("stat ${destination_f}");
+#	system("stat ${destination_f}");
 
 	# Register database change:
@@ -153,10 +162,11 @@
 	}
 	
-
 	$query = $dbh->prepare( $sql->update_instance_uri );
 	$query->execute( $local_vol_id, $db_uri, $ins_id );
 	$query->finish;
-	die;
-    }
-}
+#	die;
+    } # END loop over files
+    rmdir($subdir);
+} # END loop over subdirectories
+rmdir($root);