X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=a247782199c7c3e12a05676596395c86d5aef6e1;hb=refs%2Ftags%2F1.54;hp=e1ab6dd1c6ad3a977e9730bd9d1920df997a18a5;hpb=6a510dc82f3050640dfe6b8d499995348075fe7a;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index e1ab6dd1..a2477821 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -22,7 +22,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -49,15 +49,15 @@ $param = "$dirprefix/param";
 
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
-			  ['by', 'c', 7],
-			  ['origin', 'c', 8],
-			  ['channel', 'c', 9],
-			  ['by_dxcc', 'nc', 10],
-			  ['by_itu', 'ni', 11],
-			  ['by_zone', 'nz', 12],
-			  ['origin_dxcc', 'nc', 13],
-			  ['origin_itu', 'ni', 14],
-			  ['origin_zone', 'nz', 15],
+			  ['by', 'c', 0],
+			  ['origin', 'c', 1],
+			  ['channel', 'c', 2],
+			  ['by_dxcc', 'nc', 3],
+			  ['by_itu', 'ni', 4],
+			  ['by_zone', 'nz', 5],
+			  ['origin_dxcc', 'nc', 6],
+			  ['origin_itu', 'ni', 7],
+			  ['origin_zone', 'nz', 8],
 			 ], 'Filter::Cmd');
 
 sub init
@@ -98,7 +98,7 @@ sub update
 		(@allowed == 0 && @denied == 0)) {
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
-		if ($mydate >= $date) {
+		if ($mydate > $date) {
 			if ($myr) {
 				$r = 0 + $myr;
 			} else {
@@ -268,12 +268,12 @@ sub readfile
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($d, $sfi, $k, $a, $text) = @_; 
+	my ($d, $sfi, $k, $a, $text, $call) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
  
-	my $dupkey = "W$d|$sfi|$k|$a";
+	my $dupkey = "W$d|$sfi|$k|$a|$call";
 	return DXDupe::check($dupkey, $main::systime+$dupage);
 }