From: minima Date: Mon, 16 Apr 2001 10:08:03 +0000 (+0000) Subject: fix error messages if you leave out keywords X-Git-Tag: R_1_47~24 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=70261345f844db52943884eb12c204c17105721b;p=spider.git fix error messages if you leave out keywords --- diff --git a/Changes b/Changes index c6d49fa6..05801302 100644 --- 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 1b028e92..9eee8b9d 100644 --- 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 b35770de..b8f4c861 100644 --- 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 bfa89dc2..048241bc 100644 --- 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 f19db5e8..965761c9 100644 --- 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 9783185e..15d3066e 100644 --- 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 f8f7615c..d434f0f3 100644 --- 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 fb3ad126..a57d02c4 100644 --- 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 3be6330f..2af46847 100644 --- 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 cd4272c7..3dd245b2 100644 --- 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 c8263d94..642fc542 100644 --- 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...',