Index: trunk/tools/stsci_disks/p4_restore.pl
===================================================================
--- trunk/tools/stsci_disks/p4_restore.pl	(revision 40441)
+++ trunk/tools/stsci_disks/p4_restore.pl	(revision 40443)
@@ -29,5 +29,7 @@
 
 my (    $db, $dbhost, $dbpass, $dbuser);
-my $conffile = "/home/panstarrs/ipp/ippconfig/nebulous.config";
+#my $conffile = "/home/panstarrs/ipp/ippconfig/nebulous.config";
+my $conffile = '/data/ippc64.1/ippitc/ippconfig/nebulous.config';
+
 if (-e $conffile) {
 #    printf STDERR "found config\n";
@@ -53,5 +55,5 @@
 
 pod2usage( -msg => "Cannot configure nebulous database", -exitval => 2) unless
-    defined $host && defined $volume && defined $dir && 
+    defined $host && defined $volume && defined $dir &&
     defined $db && defined $dbhost && defined $dbuser && defined $dbpass;
 
@@ -71,21 +73,36 @@
 my $time = time();
 
-my $dbh = DBI->connect(
-    "DBI:mysql:database=$db:host=$dbhost",
-    $dbuser,
-    $dbpass,
-    {
-        RaiseError => 1,
-        PrintError => 0,
-        AutoCommit => 1,
-    },
-    );
+
+#$dbhost = '166.122.172.39';
+#my $dbport = '3308';
+#my $dbh = DBI->connect(
+#     "DBI:mysql:database=$db:host=$dbhost:port=$dbport",
+#     $dbuser,
+#     $dbpass,
+#     {
+#         RaiseError => 1,
+#         PrintError => 0,
+#         AutoCommit => 1,
+#     },
+#     );
+use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
+
+my $dbh = DBI->connect("DBI:mysql:database=${db};host=${dbhost};" .
+                       "mysql_socket=" . DB_SOCKET(),
+		       ${dbuser},${dbpass},
+		       { RaiseError => 1, AutoCommit => 1}
+    ) or die "Unable to connect to database $DBI::errstr\n";
 
 
-my $logDest = "neb://any/stsci_shuffle/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+my $logDest = "/export/${host}.${volume}/retire_rsync/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+
+#if ((${host} eq 'ippb04')&&($volume == 2)) {
+#    $logDest = "/export/${host}.0/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}";
+my $root = "/export/${host}.${volume}/retire_rsync/data/${source}.${source_vol}/nebulous/${dir}";
 my @subdirectories = <$root/*>;
 
@@ -113,5 +130,5 @@
 
     my $destination_subdir = $subdir;
-    $destination_subdir =~ s%/stsci_shuffle/${source}.${source_vol}/nebulous%/nebulous%;
+    $destination_subdir =~ s%/retire_rsync/data/${source}.${source_vol}/nebulous%/nebulous%;
 
     my @files = <${subdir}/*>;
@@ -121,49 +138,51 @@
     print "LOG BEGIN $subdir $time $dtime\n";
     for (my $i = 0; $i <= $#files; $i++) {
-	my $f = $files[$i];
+        my $f = $files[$i];
         my ($ins_id);
         $ins_id = $f;
         $ins_id =~ s/^$subdir\///;
         $ins_id =~ s/\..*//;
-	
-	# Write log of what we plan to do.
-	my $destination_f = $f;
-	$destination_f =~ s%/stsci_shuffle/${source}.${source_vol}/nebulous%/nebulous%;
-	
-	my $db_uri = $destination_f;
-	$db_uri =~ s%^/export/%/data/%;
-	$db_uri = 'file://' . $db_uri;
 
-	print "$ins_id $f $destination_f $db_uri\n";
+        # Write log of what we plan to do.
+        my $destination_f = $f;
+        $destination_f =~ s%/retire_rsync/data/${source}.${source_vol}/nebulous%/nebulous%;
 
-#	die;
+        my $db_uri = $destination_f;
+        $db_uri =~ s%^/export/%/data/%;
+        $db_uri = 'file://' . $db_uri;
 
-	# Do move of file.
-	if (-e $destination_f) {
-	    print "FILE ALREADY FOUND\n";
-	    next;
-	}
+        print "$ins_id $f $destination_f $db_uri\n";
 
-	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}");
+#       die;
 
-	# Register database change:
+        # Do move of file.
+        if (-e $destination_f) {
+            print "FILE ALREADY FOUND\n";
+            next;
+        }
 
-	unless (-e $destination_f) {
-	    die;
-	}
-	
-	$query = $dbh->prepare( $sql->update_instance_uri );
-	$query->execute( $local_vol_id, $db_uri, $ins_id );
-	$query->finish;
-#	die;
+        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}");
+
+        # Register database change:
+
+        unless (-e $destination_f) {
+            die;
+        }
+
+        $query = $dbh->prepare( $sql->update_instance_uri );
+        $query->execute( $local_vol_id, $db_uri, $ins_id );
+        $query->finish;
+#       die;
     } # END loop over files
     rmdir($subdir);