X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXSql.pm;h=9c440fbd48acab19ec7d32d80a83e92f6d18ff3a;hb=refs%2Fheads%2Fnewusers;hp=8e2085de009687e9c61e7bcdb8a85566d2fac904;hpb=53149d8378ab6615e238427b46b64a59581604e1;p=spider.git

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index 8e2085de..9c440fbd 100644
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -1,7 +1,7 @@
 #
 # The master SQL module
 #
-# $Id$
+#
 #
 # Copyright (c) 2006 Dirk Koopman G1TLH
 #
@@ -10,17 +10,10 @@ package DXSql;
 
 use strict;
 
-use DXSql::SQLite;
-use DXSql::mysql;
 use DXDebug;
 
-use vars qw($VERSION $BRANCH);
-$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;
+use vars qw($active);
+$active = 0;
 
 sub init
 {
@@ -67,7 +60,7 @@ sub connect
 	my $dbh;
 	eval {
 		no strict 'refs';
-		$dbh = DBI->connect($dsn, $user, $passwd, {AutoCommit => 0}); 
+		$dbh = DBI->connect($dsn, $user, $passwd); 
 	};
 	unless ($dbh) {
 		$active = 0;
@@ -91,16 +84,19 @@ sub do
 	eval { $self->{dbh}->do($s); }; 
 }
 
+sub begin_work
+{
+	$_[0]->{dbh}->begin_work;
+}
+
 sub commit
 {
 	$_[0]->{dbh}->commit;
-	$_[0]->{dbh}->{AutoCommit} = 0;
 }
 
 sub rollback
 {
 	$_[0]->{dbh}->rollback;
-	$_[0]->{dbh}->{AutoCommit} = 0;
 }
 
 sub quote
@@ -116,7 +112,7 @@ sub prepare
 sub spot_insert_prepare
 {
 	my $self = shift;
-	return $self->prepare('insert into spot values(?' . ',?' x 14 . ')');
+	return $self->prepare('insert into spot values(?' . ',?' x 15 . ')');
 }
 
 sub spot_insert
@@ -126,6 +122,8 @@ sub spot_insert
 	my $sth = shift;
 	
 	if ($sth) {
+		push @$spot, undef while  @$spot < 15;
+		pop @$spot while @$spot > 15;
 		eval {$sth->execute(undef, @$spot)};
 	} else {
 		my $s = "insert into spot values(NULL,";
@@ -142,7 +140,8 @@ sub spot_insert
 		$s .= $spot->[10] . ',';
 		$s .= $spot->[11] . ',';
 		$s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
-		$s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ')';
+		$s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ',';
+		$s .= (length $spot->[14] ? $self->quote($spot->[14]) : 'NULL') . ')';
 		eval {$self->do($s)};
 	}
 }