fix error messages if you leave out keywords

diff --git a/Changes b/Changes
index c6d49fa68fd5d4f6c812f9749ba7f500322d584b..058013021e1da4a8edd8767c8116468dba0f406f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+16Apr01=======================================================================
+1. make the correct error messages come out on reject/accept when people
+leave out keywords like 'on'.
 15Apr01=======================================================================
 1. made some mods to the sgml documentation for 1.47
 2. added show/connect command

diff --git a/cmd/accept/announce.pl b/cmd/accept/announce.pl
index 1b028e920ab3b5decb7fd3a9d235660559a56ab9..9eee8b9d3981b2c997d4099bd0b4cc6d33cc2d9e 100644 (file)
--- a/cmd/accept/announce.pl
+++ b/cmd/accept/announce.pl
@@ -11,4 +11,4 @@ my $type = 'accept';
 my $sort  = 'ann';
 
 my ($r, $filter, $fno) = $AnnTalk::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/accept/spots.pl b/cmd/accept/spots.pl
index b35770de6f67a62a28a9db5312b5952630dbb214..b8f4c861b0e41bbae5294186d0565a6accb9dbf1 100644 (file)
--- a/cmd/accept/spots.pl
+++ b/cmd/accept/spots.pl
@@ -11,4 +11,4 @@ my $type = 'accept';
 my $sort  = 'spots';
 
 my ($r, $filter, $fno) = $Spot::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/accept/wcy.pl b/cmd/accept/wcy.pl
index bfa89dc2624906a7890772393ce66f7e4aa364f4..048241bc86789ba18858c0850df209d99656a70d 100644 (file)
--- a/cmd/accept/wcy.pl
+++ b/cmd/accept/wcy.pl
@@ -11,4 +11,4 @@ my $type = 'accept';
 my $sort  = 'wcy';
 
 my ($r, $filter, $fno) = $WCY::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/accept/wwv.pl b/cmd/accept/wwv.pl
index f19db5e843d2e6e0cc99e37978e4d9a61dc803be..965761c9b2cab577dc0a53107c0c46562273e574 100644 (file)
--- a/cmd/accept/wwv.pl
+++ b/cmd/accept/wwv.pl
@@ -11,4 +11,4 @@ my $type = 'accept';
 my $sort  = 'wwv';
 
 my ($r, $filter, $fno) = $Geomag::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/reject/announce.pl b/cmd/reject/announce.pl
index 9783185e2ac892a20578d30d90074c5b19a05492..15d3066ec34d7ebf79e8080033ad8ae002b385ec 100644 (file)
--- a/cmd/reject/announce.pl
+++ b/cmd/reject/announce.pl
@@ -11,4 +11,4 @@ my $type = 'reject';
 my $sort  = 'ann';
 
 my ($r, $filter, $fno) = $AnnTalk::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/reject/spots.pl b/cmd/reject/spots.pl
index f8f7615cd33f09c2109cad18d3433578bf4aba41..d434f0f364640d1ff79e394ef755a2f24ca03d2b 100644 (file)
--- a/cmd/reject/spots.pl
+++ b/cmd/reject/spots.pl
@@ -11,4 +11,4 @@ my $type = 'reject';
 my $sort  = 'spots';
 
 my ($r, $filter, $fno) = $Spot::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/reject/wcy.pl b/cmd/reject/wcy.pl
index fb3ad126eb82626bb5d40233014c2ee40caae139..a57d02c4e844210f511db40a3c10c6779393311c 100644 (file)
--- a/cmd/reject/wcy.pl
+++ b/cmd/reject/wcy.pl
@@ -11,4 +11,4 @@ my $type = 'reject';
 my $sort  = 'ann';
 
 my ($r, $filter, $fno) = $WCY::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/cmd/reject/wwv.pl b/cmd/reject/wwv.pl
index 3be6330f54d8e1155aaacf0b2f888582ac5eb592..2af46847b37ec1e1ba3818a3202bf8fa0b75d9bf 100644 (file)
--- a/cmd/reject/wwv.pl
+++ b/cmd/reject/wwv.pl
@@ -11,4 +11,4 @@ my $type = 'reject';
 my $sort  = 'ann';
 
 my ($r, $filter, $fno) = $Geomag::filterdef->cmd($self, $sort, $type, $line);
-return (0, $r ? $r : $self->msg('filter1', $fno, $filter->{name})); 
+return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name})); 

diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index cd4272c787530d24473dc821fcd7b724596762c9..3dd245b2122497dd7c3986088933cd8f0ea41e41 100644 (file)
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -28,6 +28,7 @@ sub finish
 {
        undef $dbm;
        untie %d;
+       undef %d;
 }
 
 sub check

diff --git a/perl/Messages b/perl/Messages
index c8263d94b0bf0b291275911ad8aa05058d683ce1..642fc5426c92fd84de89d76ea5389b466545e13c 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -85,7 +85,7 @@ package DXM;
                                export2 => '$_[3] has error exporting msg $_[0] to $_[1] ($_[2])',
                                export3 => '$_[2 ] exported msg $_[0] to $_[1]',
                                filter1 => 'Filter $_[0] updated for $_[1]',
-                               filter2 => 'Need a value for $_[0]',
+                               filter2 => 'Unknown filter keyword $_[0]',
                                filter3 => 'No filters defined for $_[0]',
                                filter4 => '$_[0]$_[1] Filter $_[2] deleted for $_[3]',
                                filter5 => 'need some filter commands...',