X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXSql.pm;h=8e2085de009687e9c61e7bcdb8a85566d2fac904;hb=0f0ef738611adb7e4a2b6ae8207a8506d3f26563;hp=fcf4e4ce5608dd5fc4068f4adb2c19924278483f;hpb=917f7586cf60e96e07233c72b9854d754638f253;p=spider.git

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index fcf4e4ce..8e2085de 100644
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -10,6 +10,8 @@ package DXSql;
 
 use strict;
 
+use DXSql::SQLite;
+use DXSql::mysql;
 use DXDebug;
 
 use vars qw($VERSION $BRANCH);
@@ -22,6 +24,8 @@ our $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 = '';
 	}