fix more 5.8 isms

[spider.git] / perl / DXSql.pm

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index a2194a7b2f7618a06f0ba10a1b1064f69f22e0d5..8ce3cb5ae97b4208774d830d30c809570731a96c 100644 (file)
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -10,18 +10,22 @@ package DXSql;
 
 use strict;
 
+use DXSql::SQLite;
+use DXSql::mysql;
 use DXDebug;
 
-use vars qw($VERSION $BRANCH);
+use vars qw($VERSION $BRANCH $active);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-our $active = 0;
+$active = 0;
 
 sub init
 {
+       my $dsn = shift;
+       return unless $dsn;
        return $active if $active;
        
        eval { 
@@ -31,6 +35,7 @@ sub init
                import DBI;
                $active++;
        }
+       undef $@;
        return $active;
 }