diff options
author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-06-26 05:25:00 +0000 |
---|---|---|
committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-06-26 05:25:00 +0000 |
commit | 79cb0d14e92c84125ae68e0c1a5cc7d841989ff0 (patch) | |
tree | f184fe7084773621ef424e999061d5ceb3c3de1b /LedgerSMB.pm | |
parent | b3b539da6a19529cca194bb3ff4e9d318886d011 (diff) |
Setting things up so that the LedgerSMB.pm tests run
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1325 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB.pm')
-rwxr-xr-x | LedgerSMB.pm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/LedgerSMB.pm b/LedgerSMB.pm index a8ccb2d4..ac5c8e29 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -164,10 +164,13 @@ sub new { #this is an ugly hack we need to rethink. return $self; } - - $self->{_user} = LedgerSMB::User->fetch_config($self->{login}); my $locale = LedgerSMB::Locale->get_handle($self->{_user}->{countrycode}) or $self->error(__FILE__.':'.__LINE__.": Locale not loaded: $!\n"); + if ( !${LedgerSMB::Sysconfig::GLOBALDBH} ) { + $locale->text("No GlobalDBH Configured or Could not Connect"); + } + + $self->{_user} = LedgerSMB::User->fetch_config($self->{login}); $self->{_locale} = $locale; $self->{stylesheet} = $self->{_user}->{stylesheet}; if ( $self->{password} ) { @@ -242,9 +245,12 @@ sub _get_password { sub debug { my $self = shift @_; - my %args = @_; - my $file = $args{file}; - my $d = Data::Dumper->new( [@_] ); + my $args = shift @_; + my $file; + if (scalar keys %$args){ + my $file = $args->{'file'}; + } + my $d = Data::Dumper->new( [$self] ); $d->Sortkeys(1); if ($file) { @@ -650,7 +656,7 @@ sub _db_init { if ( $myconfig->{dboptions} ) { $dbh->do( $myconfig->{dboptions} ); } - + $self->{dbh} = $dbh; my $query = "SELECT t.extends, coalesce (t.table_name, 'custom_' || extends) || ':' || f.field_name as field_def |