Index: trunk/ippScripts/scripts/warp_overlap.pl
===================================================================
--- trunk/ippScripts/scripts/warp_overlap.pl	(revision 12013)
+++ trunk/ippScripts/scripts/warp_overlap.pl	(revision 12021)
@@ -32,7 +32,7 @@
 use Pod::Usage qw( pod2usage );
 
-my ($p4_id, $dbname, $workdir, $no_update, $no_op);
+my ($warp_id, $dbname, $workdir, $no_update, $no_op);
 GetOptions(
-    'p4_id|i=s'         => \$p4_id, # Phase 4 identifier
+    'warp_id|i=s'       => \$warp_id, # Warp identifier
     'dbname|d=s'        => \$dbname, # Database name
     'workdir|w=s'       => \$workdir, # Working directory, for output files
@@ -43,11 +43,11 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --p4_id",
+    -msg => "Required options: --warp_id",
     -exitval => 3,
-) unless defined $p4_id;
+) unless defined $warp_id;
 
 # Look for programs we need
 my $missing_tools;
-my $warptool = can_run('p4tool') or (warn "Can't find p4tool" and $missing_tools = 1);
+my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
 #my $overlap = can_run('overlap') or (warn "Can't find overlap" and $missing_tools = 1);
 if ($missing_tools) { 
@@ -59,5 +59,5 @@
 my $imfiles;
 {
-    my $command = "$warptool -imfile -p4_id $p4_id";
+    my $command = "$warptool -imfile -warp_id $warp_id";
     $command .= " -dbname $dbname" if defined $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -65,12 +65,12 @@
     unless ($success) {
 	$error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-	&my_die("Unable to perform warptool -imfile: $error_code", $p4_id, $error_code);
+	&my_die("Unable to perform warptool -imfile: $error_code", $warp_id, $error_code);
     }
 
     my $mdcParser = PS::IPP::Metadata::Config->new;	# Parser for metadata config files
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-	&my_die("Unable to parse metadata config doc", $p4_id, $PS_EXIT_PROG_ERROR);
+	&my_die("Unable to parse metadata config doc", $warp_id, $PS_EXIT_PROG_ERROR);
     $imfiles = parse_md_list($metadata) or 
-	&my_die("Unable to parse metadata list", $p4_id, $PS_EXIT_PROG_ERROR);
+	&my_die("Unable to parse metadata list", $warp_id, $PS_EXIT_PROG_ERROR);
 }
 
@@ -90,10 +90,10 @@
 # Generate a MDC file with the overlaps
 $workdir = $ipprc->convert_filename_absolute( $workdir );
-my $overlapName = File::Spec->catfile( $workdir, $p4_id . '.overlap.mdc' ); 
+my $overlapName = File::Spec->catfile( $workdir, $warp_id . '.overlap.mdc' ); 
 open my $overlapFile, "> $overlapName" or
-    &my_die("Unable to open mdc file $overlapName", $p4_id, $PS_EXIT_DATA_ERROR);
-print $overlapFile "p4SkyCellMap MULTI\n\n";
+    &my_die("Unable to open mdc file $overlapName", $warp_id, $PS_EXIT_DATA_ERROR);
+print $overlapFile "warpSkyCellMap MULTI\n\n";
 foreach my $imfile (@$imfiles) {
-    print $overlapFile "p4_id\t\tS32\t" . $imfile->{p4_id} . "\n";
+    print $overlapFile "warp_id\t\tS32\t" . $imfile->{warp_id} . "\n";
     print $overlapFile "skycell_id\tSTR\t" . $imfile->{skycell_id} . "\n";
     print $overlapFile "tess_id\t\tSTR\t" . $imfile->{tess_id} . "\n";
@@ -106,5 +106,5 @@
 # Add the processed file to the database
 unless ($no_update) {
-    my $command = "$warptool -addoverlap -p4_id $p4_id -info $overlapName"; # Command to run p4tool
+    my $command = "$warptool -addoverlap -warp_id $warp_id -info $overlapName"; # Command to run warptool
     $command .= " -dbname $dbname" if defined $dbname;
 
@@ -125,10 +125,10 @@
 {
     my $msg = shift;		# Warning message on die
-    my $p4_id = shift;		# Phase 4 identifier
+    my $warp_id = shift;	# Warp identifier
     my $exit_code = shift;	# Exit code to add
 
     warn($msg);
-    if ($p4_id and not $no_update) {
-	my $command = "$warptool -addoverlap -p4_id $p4_id -code $exit_code";
+    if ($warp_id and not $no_update) {
+	my $command = "$warptool -addoverlap -warp_id $warp_id -code $exit_code";
 	$command .= " -dbname $dbname" if defined $dbname;
         system ($command);