|
Lines 97-103
BEGIN {
Link Here
|
| 97 |
$VERSION = '3.07.00.049'; |
97 |
$VERSION = '3.07.00.049'; |
| 98 |
} |
98 |
} |
| 99 |
|
99 |
|
| 100 |
use DBI; |
100 |
use DBIx::Connector; |
| 101 |
use Encode; |
101 |
use Encode; |
| 102 |
use ZOOM; |
102 |
use ZOOM; |
| 103 |
use XML::Simple; |
103 |
use XML::Simple; |
|
Lines 783-790
sub _new_dbh
Link Here
|
| 783 |
my $db_user = $context->config("user"); |
783 |
my $db_user = $context->config("user"); |
| 784 |
my $db_passwd = $context->config("pass"); |
784 |
my $db_passwd = $context->config("pass"); |
| 785 |
# MJR added or die here, as we can't work without dbh |
785 |
# MJR added or die here, as we can't work without dbh |
| 786 |
my $dbh = DBI->connect("DBI:$db_driver:dbname=$db_name;host=$db_host;port=$db_port", |
786 |
my $dbh = DBIx::Connector->connect( |
| 787 |
$db_user, $db_passwd, {'RaiseError' => $ENV{DEBUG}?1:0 }) or die $DBI::errstr; |
787 |
"dbi:$db_driver:dbname=$db_name;host=$db_host;port=$db_port", |
|
|
788 |
$db_user, $db_passwd, |
| 789 |
{ |
| 790 |
'RaiseError' => $ENV{DEBUG} ? 1 : 0 |
| 791 |
} |
| 792 |
); |
| 788 |
|
793 |
|
| 789 |
# Check for the existence of a systempreference table; if we don't have this, we don't |
794 |
# Check for the existence of a systempreference table; if we don't have this, we don't |
| 790 |
# have a valid database and should not set RaiseError in order to allow the installer |
795 |
# have a valid database and should not set RaiseError in order to allow the installer |
| 791 |
- |
|
|