Changeset 35574 for trunk/pstamp/test/maketestreq

Timestamp:

May 9, 2013, 3:23:50 PM (13 years ago)

Author:

bills

Message:

get pstamp database server and name from site.config

File:

• trunk/pstamp/test/maketestreq (modified) (3 diffs)

trunk/pstamp/test/maketestreq

@@ -30 +30 @@
 }
 
-# XXX: get these from site.config
-$pstamptool .= " -dbserver ippc19 -dbname ippRequestServer";
-
 
 my ($input, $submit, $listfile, $delete, $simple, $tag_req_name, $req_name, $email);
+my ($dbname, $dbserver);
 my ($save_temps, $verbose);
 
@@ -50 +48 @@
     'label=s'           => \$label,
     'email=s'           => \$email,
+
+    'dbname=s'           => \$dbname,
+    'dbserver=s'         => \$dbserver,
 
     'listfile|l'        => \$listfile,
@@ -68 +69 @@
 die ("Input file $input not found\n") unless (-e $input);
 die ("Input file $input not readable\n") unless (-r $input);
+
+if (!$dbname or !$dbserver) {
+    my $ipprc = PS::IPP::Config->new('GPC1');
+
+    if (!$dbserver) {
+        $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+        die ("couldn't find dbserver in site.config\n") unless $dbserver;
+    }
+    if (!$dbname) {
+        $dbname =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBNAME');
+        die ("couldn't find dbname in site.config\n") unless $dbname;
+    }
+}
+$pstamptool .= " -dbserver $dbserver -dbname $dbname";
+
 
 # if request name was not supplied make one