--- bin/SlaveDelTable	2003/08/05 09:52:36	1.1
+++ bin/SlaveDelTable	2003/11/02 10:21:45	1.3
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # SlaveAddTable
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,34 +6,35 @@
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
+use strict;
 use Pg;
 use Getopt::Long;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help",
-		     "host=s", "user=s", "password=s");
+my ($debug,$verbose) = (0,0);
+my ($help,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-
-if (defined($opt_help) || (scalar(@ARGV) < 2)) {
-    print "Usage: $0 --host=name --user=name --password=string slavedb table\n";
-    exit ((scalar(@ARGV) < 2)? 1: 0);
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
+	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2)) {
+    print "Usage: $0 [options] slavedb table
+Options:
+	--slavehost=hostname --slaveport=port
+	--slaveuser=username --slavepassword=string
+";
+    exit ((scalar(@ARGV) < 2)? 1:0);
 }
 
 my $dbname = $ARGV[0];
 my $table = $ARGV[1];
 #my $keyname = $ARGV[2];
 
-my $sinfo = "dbname=$dbname";
-$sinfo = "$sinfo host=$opt_host" if (defined($opt_host));
-$sinfo = "$sinfo user=$opt_user" if (defined($opt_user));
-$sinfo = "$sinfo password=$opt_password" if (defined($opt_password));
-
-my $dbname = $ARGV[0];
-my $table = $ARGV[1];
-my $keyname = $ARGV[2];
+my $sinfo = MkInfo($dbname,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
 my $conn = Pg::connectdb($sinfo);
 if ($conn->status != PGRES_CONNECTION_OK) {
@@ -41,7 +42,7 @@
     exit 1;
 }
 
-my $result = $conn->exec("BEGIN");
+$result = $conn->exec("BEGIN");
 die $conn->errorMessage if $result->resultStatus ne PGRES_COMMAND_OK;
 
 $result = $conn->exec("DELETE FROM _RSERV_SLAVE_TABLES_ WHERE tname='$table'");