X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXSql.pm;h=842e30054fc1a8c00db5f483d8593ef02b25e10b;hb=520b5d73641f384e1ba59e4cb6b5ab84b54baf5a;hp=d125cc59ca37ac4ba436a0438f8c1cb8ab0656fd;hpb=61885d0dba3c8e06146aabb40031609ef1eb5b2e;p=spider.git diff --git a/perl/DXSql.pm b/perl/DXSql.pm index d125cc59..842e3005 100644 --- a/perl/DXSql.pm +++ b/perl/DXSql.pm @@ -10,8 +10,6 @@ package DXSql; use strict; -use DXSql::SQLite; -use DXSql::mysql; use DXDebug; use vars qw($active); @@ -164,6 +162,7 @@ sub spot_search $expr =~ s/\$f11/spottercq/g; $expr =~ s/\$f12/spotstate/g; $expr =~ s/\$f13/spotterstate/g; + $expr =~ s/\$f14/ipaddr/g; $expr =~ s/\$f0/freq/g; $expr =~ s/\$f1/spotcall/g; $expr =~ s/\$f2/time/g; @@ -185,7 +184,7 @@ sub spot_search 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 +origin,spotitu,spotcq,spotteritu,spottercq,spotstate,spotterstate,ipaddr from spot where $expr order by time desc limit $n}; dbg("sql expr: $s") if isdbg('search'); my $ref = $self->{dbh}->selectall_arrayref($s);