X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=57cf2599a103e0c71d310da69487144387898ddb;hb=c42f6d2e451d149bd3ee9059ed8a9a4589c47f6d;hp=74e4e27a753ed2f640630f922036729575011537;hpb=d07b38eed1044b3b88876a53b8e5870386f38a20;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 74e4e27a..57cf2599 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -23,13 +23,14 @@ use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $fil
 $fp = undef;
 $maxspots = 50;					# maximum spots to return
 $defaultspots = 10;				# normal number of spots to return
-$maxdays = 365;					# normal maximum no of days to go back
+$maxdays = 3*31;				# normal maximum no of days to go back
 $dirprefix = "spots";
 $duplth = 20;					# the length of text to use in the deduping
 $dupage = 3*3600;               # the length of time to hold spot dups
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['freq', 'r', 0, 0, \&decodefreq],
+			  ['on', 'r', 0, 0, \&decodefreq],
 			  ['call', 'c', 1],
 			  ['info', 't', 3],
 			  ['by', 'c', 4],
@@ -182,7 +183,7 @@ sub search
 	$expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
 	#  $expr =~ s/\$f(\d)/\$spots[$1]/g;               # swap the letter n for the correct field name
   
-	dbg("search", "expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
+	dbg("search", "hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
   
 	# build up eval to execute
 	$eval = qq(
@@ -229,6 +230,7 @@ sub ftor
 	my ($a, $b) = @_;
 	return undef unless $a < $b;
 	$b--;
+	my $d = $b - $a;
 	my @a = split //, $a;
 	my @b = split //, $b;
 	my $out;
@@ -238,12 +240,14 @@ sub ftor
 	while (@b) {
 		my $aa = shift @a;
 		my $bb = shift @b;
-		if ($aa eq $bb) {
+		if (@b < (length $d) - 1) {
+			$out .= '\\d';
+		} elsif ($aa eq $bb) {
 			$out .= $aa;
 		} elsif ($aa < $bb) {
 			$out .= "[$aa-$bb]";
 		} else {
-			$out .= "[$bb-$aa]";
+			$out .= "[0-$bb$aa-9]";
 		}
 	}
 	return $out;
@@ -299,6 +303,7 @@ sub dup
 	chomp $text;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	unpad($text);
+	$text =~ s/[\\\%]\d+//g;
 	$text =~ s/[^a-zA-Z0-9]//g;
 	my $dupkey = "X$freq|$call|$d|\L$text";
 	return DXDupe::check($dupkey, $main::systime+$dupage);