X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=b7344702ddf1ce174b31db920fedfc225cb97fd1;hb=fc8ec20708a70b6297d3c8b8c35b1086c6018cbb;hp=f6b14564ff98cc86ea2b537830274e453d1f7ff5;hpb=e489ed64a08572261d73f33e1c83cb9e73905662;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index f6b14564..b7344702 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -50,6 +50,7 @@ $filterdef = bless ([ ['call_state', 'ns', 12], ['by_state', 'ns', 13], ['channel', 'c', 14], + ['ip', 'c', 15], ], 'Filter::Cmd'); $totalspots = $hfspots = $vhfspots = 0; @@ -222,7 +223,7 @@ sub add # $f5 = spotted dxcc country # $f6 = spotter dxcc country # $f7 = origin -# +# $f8 = ip address # # In addition you can specify a range of days, this means that it will start searching # from days less than today to days less than today @@ -302,6 +303,7 @@ sub search } } ); + dbg("Spot eval: $eval") if isdbg('searcheval'); @@ -403,7 +405,7 @@ sub dup $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; $text = uc unpad($text); if ($cty && $text && length $text <= 4) { - unless ($text =~ /^C?Q/ || $text =~ /^\d+$/ || $text =~ /\s/) { + unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) { my @try = Prefix::cty_data($text); $text = "" if $cty == $try[0]; }