[Fusionforge-commits] r11925 - in branches/Branch_5_1/src: etc/templates utils
Roland Mas
lolando at libremir.placard.fr.eu.org
Mon Jan 3 17:54:31 CET 2011
Author: lolando
Date: 2011-01-03 17:54:30 +0100 (Mon, 03 Jan 2011)
New Revision: 11925
Modified:
branches/Branch_5_1/src/etc/templates/local.pl
branches/Branch_5_1/src/utils/include.pl
Log:
Cope with remote database in Perl scripts
Modified: branches/Branch_5_1/src/etc/templates/local.pl
===================================================================
--- branches/Branch_5_1/src/etc/templates/local.pl 2011-01-03 15:53:55 UTC (rev 11924)
+++ branches/Branch_5_1/src/etc/templates/local.pl 2011-01-03 16:54:30 UTC (rev 11925)
@@ -18,6 +18,8 @@
chomp $sys_news_group ;
$sys_dbhost = qx!$fgcpath/forge_get_config database_host!;
chomp $sys_dbhost ;
+$sys_dbport = qx!$fgcpath/forge_get_config database_port!;
+chomp $sys_dbport ;
$sys_dbname = qx!$fgcpath/forge_get_config database_name!;
chomp $sys_dbname ;
$sys_dbuser = qx!$fgcpath/forge_get_config database_user!;
Modified: branches/Branch_5_1/src/utils/include.pl
===================================================================
--- branches/Branch_5_1/src/utils/include.pl 2011-01-03 15:53:55 UTC (rev 11924)
+++ branches/Branch_5_1/src/utils/include.pl 2011-01-03 16:54:30 UTC (rev 11925)
@@ -15,7 +15,14 @@
# Database Connect Functions
##############################
sub db_connect ( ) {
- $dbh ||= DBI->connect("DBI:Pg:dbname=$sys_dbname","$sys_dbuser","$sys_dbpasswd") ;
+ my $str = "DBI:Pg:dbname=$sys_dbname" ;
+ if ($sys_dbhost ne '') {
+ $str .= ";host=$sys_dbhost" ;
+ }
+ if ($sys_dbport ne '') {
+ $str .= ";port=$sys_dbport" ;
+ }
+ $dbh ||= DBI->connect($str,"$sys_dbuser","$sys_dbpasswd") ;
if (! $dbh) {
die "Error while connecting to database: $!" ;
}
More information about the Fusionforge-commits
mailing list