Changeset 432

Timestamp:

07/16/10 17:31:13 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Clarify, clean up, and make sane configuration for database
host, db name, user, and password. See #17.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• MyIPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -130 +130 @@
 # Set up for a PostgreSQL db;  could be any transactional DBMS with the
 # right changes.
-# This definition should be sub connectDB($$$) to be technically correct,
-# but this breaks.  GRR.
 sub connectDB {
-  my ($dbname,$user,$pass) = @_;
+  my $dbname = shift;
+  my $user = shift;
+  my $pass = shift;
+  my $dbhost = shift;
+
   my $dbh;
-  my $DSN = "DBI:Pg:host=ipdb-db;dbname=$dbname";
-#  my $user = 'ipdb';
-#  my $pw   = 'ipdbpwd';
+  my $DSN = "DBI:Pg:".($dbhost ? "host=$dbhost;" : '')."dbname=$dbname";
 
 # Note that we want to autocommit by default, and we will turn it off locally as necessary.

trunk/cgi-bin/MyIPDB.pm

@@ -15 +15 @@
 use IPDB 2.0 qw(:ALL);
 
-## connectDB_My()
-# Wrapper for IPDB::connectDB
-# Takes no arguments, returns whatever IPDB::connectDB returns.
-sub connectDB_My {
-  return connectDB("ipdb", "ipdb", "ipdbpwd");
-} # end connectDB_My()
+
+# DSN, user, and password for database.  These **MUST** be set.
+my $dbname = 'ipdb';
+my $dbuser = 'ipdb';
+my $dbpass = 'ipdbpwd';
+# DB host is optional.
+my $dbhost = 'ipdb-db';
 
 # Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().
@@ -44 +45 @@
 #$IPDB::syslog_facility = 'daemon';
 
+
+## connectDB_My()
+# Wrapper for IPDB::connectDB
+# Takes no arguments, returns whatever IPDB::connectDB returns.
+sub connectDB_My {
+  return connectDB($dbname, $dbuser, $dbpass, $dbhost);
+} # end connectDB_My()
+
 # Keep Perl from complaining.
 1;