Changeset 47 for trunk/npemap.org.uk

Timestamp:

Oct 15, 2006, 5:25:05 PM (14 years ago)

Author:

Dominic Hargreaves

Message:

Use a config file for the DB parameters

Location:

trunk/npemap.org.uk/cgi

Files:

• get-postcodes.fcgi (modified) (2 diffs)
• npemap.conf (added)
• submit.fcgi (modified) (2 diffs)

trunk/npemap.org.uk/cgi/get-postcodes.fcgi

@@ -8 +8 @@
 use JSON;
 
+use vars qw($dbname $dbhost $dbuser $dbpass);
+
 sub print_err;
 sub setup_dbh;
+
+# Read in database config
+my $config = 'npemap.conf';
+do $config or die "Can't read $config!\n";
+
 
 # Set up database handler to try and make sure it's ready for the first
@@ -92 +99 @@
 sub setup_dbh {
     # $dbh is global
-    return $dbh = DBI->connect_cached("dbi:Pg:dbname=npemaps;host=127.0.0.1","npemaps","npemaps");
+    my $data_source = "dbi:Pg:dbname=$dbname";
+    $data_source .= ";host=$dbhost" if $dbhost;
+    return $dbh = DBI->connect_cached($data_source, $dbuser, $dbpass);
 }

trunk/npemap.org.uk/cgi/submit.fcgi

@@ -9 +9 @@
 use Date::Format;
 
+use vars qw($dbname $dbhost $dbuser $dbpass);
+
 sub print_err;
 sub setup_dbh;
+
+# Read in database config
+my $config = 'npemap.conf';
+do $config or die "Can't read $config!\n";
 
 # Set up database handler to try and make sure it's ready for the first
@@ -152 +158 @@
 sub setup_dbh {
     # $dbh is global
-    return $dbh = DBI->connect_cached("dbi:Pg:dbname=npemaps;host=127.0.0.1","npemaps","npemaps");
+    my $data_source = "dbi:Pg:dbname=$dbname";
+    $data_source .= ";host=$dbhost" if $dbhost;
+    return $dbh = DBI->connect_cached($data_source, $dbuser, $dbpass);
 }
+