X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXSql.pm;h=8ce3cb5ae97b4208774d830d30c809570731a96c;hb=9e5520826fe61fd3ac6941f2b8bf736a432eaa15;hp=fcf4e4ce5608dd5fc4068f4adb2c19924278483f;hpb=da65011693cc9a7a33f09424f7a19a51937d986c;p=spider.git

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index fcf4e4ce..8ce3cb5a 100644
--- 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;
 } 
 
@@ -170,7 +175,7 @@ sub spot_search
 		$expr =~ s/\$f9/spotcq/g;
 		$expr =~ s/\|\|/ or /g;
 		$expr =~ s/\&\&/ and /g;
-		$expr =~ s/=~\s+m\{\^([\w]+)[^\}]*\}/ like '$1%'/g;
+		$expr =~ s/=~\s+m\{\^([%\w]+)[^\}]*\}/ like '$1'/g;
 	} else {
 		$expr = '';
 	}