X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXSql.pm;h=437f3bbf5e22a34eba9022a115bb805eaf5bc245;hb=refs%2Fheads%2Fnewpc92timings;hp=932b9b0e2c35dcf871c9e737ab1cc95283bf3851;hpb=8b084abf6e46e762cc53bc58c19fd03e19f9c405;p=spider.git

diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index 932b9b0e..437f3bbf 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,10 +10,17 @@ package DXSql;
 
 use strict;
 
-our $active = 0;
+use DXSql::SQLite;
+use DXSql::mysql;
+use DXDebug;
+
+use vars qw($active);
+$active = 0;
 
 sub init
 {
+	my $dsn = shift;
+	return unless $dsn;
 	return $active if $active;
 	
 	eval { 
@@ -23,6 +30,7 @@ sub init
 		import DBI;
 		$active++;
 	}
+	undef $@;
 	return $active;
 } 
 
@@ -30,14 +38,37 @@ sub new
 {
 	my $class = shift;
 	my $dsn = shift;
-	my $user = shift;
-	my $passwd = shift;
 	my $self;
 	
 	return undef unless $active;
 	my $dbh;
-	eval {$dbh = DBI->connect($dsn, $user, $passwd); };
-	$self = bless {dbh => $dbh}, $class if $dbh;
+	my ($style) = $dsn =~ /^dbi:(\w+):/;
+	my $newclass = "DXSql::$style";
+	eval "require $newclass";
+	if ($@) {
+		$active = 0;
+		return undef;
+	}
+	return bless {}, $newclass;
+}
+
+sub connect
+{
+	my $self = shift; 
+	my $dsn = shift;
+	my $user = shift;
+	my $passwd = shift;
+	
+	my $dbh;
+	eval {
+		no strict 'refs';
+		$dbh = DBI->connect($dsn, $user, $passwd, {AutoCommit => 0}); 
+	};
+	unless ($dbh) {
+		$active = 0;
+		return undef;
+	}
+	$self->{dbh} = $dbh;
 	return $self;
 }
 
@@ -46,5 +77,114 @@ sub finish
 	my $self = shift;
 	$self->{dbh}->disconnect;
 } 
+
+sub do
+{
+	my $self = shift;
+	my $s = shift;
+	
+	eval { $self->{dbh}->do($s); }; 
+}
+
+sub commit
+{
+	$_[0]->{dbh}->commit;
+	$_[0]->{dbh}->{AutoCommit} = 0;
+}
+
+sub rollback
+{
+	$_[0]->{dbh}->rollback;
+	$_[0]->{dbh}->{AutoCommit} = 0;
+}
+
+sub quote
+{
+	return $_[0]->{dbh}->quote($_[1]);
+}
+
+sub prepare
+{
+	return $_[0]->{dbh}->prepare($_[1]);
+}
+
+sub spot_insert_prepare
+{
+	my $self = shift;
+	return $self->prepare('insert into spot values(?' . ',?' x 14 . ')');
+}
+
+sub spot_insert
+{
+	my $self = shift;
+	my $spot = shift;
+	my $sth = shift;
+	
+	if ($sth) {
+		eval {$sth->execute(undef, @$spot)};
+	} else {
+		my $s = "insert into spot values(NULL,";
+		$s .= sprintf("%.1f,", $spot->[0]);
+		$s .= $self->quote($spot->[1]) . "," ;
+		$s .= $spot->[2] . ',';
+		$s .= (length $spot->[3] ? $self->quote($spot->[3]) : 'NULL') . ',';
+		$s .= $self->quote($spot->[4]) . ',';
+		$s .= $spot->[5] . ',';
+		$s .= $spot->[6] . ',';
+		$s .= (length $spot->[7] ? $self->quote($spot->[7]) : 'NULL') . ',';
+		$s .= $spot->[8] . ',';
+		$s .= $spot->[9] . ',';
+		$s .= $spot->[10] . ',';
+		$s .= $spot->[11] . ',';
+		$s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
+		$s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ')';
+		eval {$self->do($s)};
+	}
+}
+
+sub spot_search
+{
+	my $self = shift;
+	my $expr = shift;
+	my $dayfrom = shift;
+	my $dayto = shift;
+	my $n = shift;
+	my $dxchan = shift;
+	
+	dbg("expr: $expr") if isdbg('search');
+	if ($expr =~ /\$f/) {
+		$expr =~ s/(?:==|eq)/ = /g;
+		$expr =~ s/\$f10/spotteritu/g;
+		$expr =~ s/\$f11/spottercq/g;
+		$expr =~ s/\$f12/spotstate/g;
+		$expr =~ s/\$f13/spotterstate/g;
+		$expr =~ s/\$f0/freq/g;
+		$expr =~ s/\$f1/spotcall/g;
+		$expr =~ s/\$f2/time/g;
+		$expr =~ s/\$f3/comment/g;
+		$expr =~ s/\$f4/spotter/g;
+		$expr =~ s/\$f5/spotdxcc/g;
+		$expr =~ s/\$f6/spotterdxcc/g;
+		$expr =~ s/\$f7/origin/g;
+		$expr =~ s/\$f8/spotitu/g;
+		$expr =~ s/\$f9/spotcq/g;
+		$expr =~ s/\|\|/ or /g;
+		$expr =~ s/\&\&/ and /g;
+		$expr =~ s/=~\s+m\{\^([%\w]+)[^\}]*\}/ like '$1'/g;
+	} else {
+		$expr = '';
+	}  
+	my $fdays = $dayfrom ? "time <= " . ($main::systime - ($dayfrom * 86400)) : "";
+	my $days = "time >= " . ($main::systime - ($dayto * 86400));
+	my $trange = $fdays ? "($fdays and $days)" : $days;
+	$expr .= $expr ? " and $trange" : $trange;
+    my $s = qq{select freq,spotcall,time,comment,spotter,spotdxcc,spotterdxcc,
+origin,spotitu,spotcq,spotteritu,spottercq,spotstate,spotterstate from spot
+where $expr order by time desc limit $n};
+    dbg("sql expr: $s") if isdbg('search');
+	my $ref = $self->{dbh}->selectall_arrayref($s);
+	return @$ref;
+}
+
 1;