Changeset 37816

Timestamp:

Jan 12, 2015, 11:21:19 AM (12 years ago)

Author:

bills

Message:

it turns out that a fix for the dbserver was already committed to the trunk.
replace last delta with that version

File:

• tags/ipp-20141024/ippScripts/scripts/stack_bkg_mk_mdc.pl (modified) (3 diffs, 1 prop)

tags/ipp-20141024/ippScripts/scripts/stack_bkg_mk_mdc.pl

@@ -13 +13 @@
 
 my ($dbname,$stack_id,$label,$camera,$filter);
+
+my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+my $siteConfig = $ipprc->{_siteConfig};
+
 #$dbname = 'gpc1';
 #$camera = 'GPC1';
@@ -28 +32 @@
 my $verbose = 0;
 
-my $ipprc = PS::IPP::Config->new( $camera );
-my $mdcParser = PS::IPP::Metadata::Config->new;
-
 use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
-my $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'DBSERVER');
-my $dbuser = 'ippuser';
-my $dbpass = 'ippuser';
+my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
+my $dbuser = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBUSER");
+my $dbpass = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBPASSWORD");
+die "database configuration not set up" unless defined($dbserver);
+die "database configuration not set up" unless defined($dbuser);
+die "database configuration not set up" unless defined($dbpass);
 my $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                    "mysql_socket=" . DB_SOCKET(),
@@ -41 +45 @@
     ) or die "Unable to connect to database $DBI::errstr\n";
 
+$ipprc = PS::IPP::Config->new( $camera );
+my $mdcParser = PS::IPP::Metadata::Config->new;