and again

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index ddb59a4c4c70a61ad4e5c3c60ea07effb263497f..a6032363ac5e7cf5d847a288e36ed4f64bcd952f 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -45,10 +45,13 @@ sub process
 
 sub listdups
 {
+       my $regex = shift;
+       $regex = '.*' unless $regex;
+       $regex =~ s/[\$\@\%]//g;
        my @out;
-       for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+       for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
                my $val = $dup{$_};
-               push @out, "$_ = $val (" . cldatetime($val) . ")";
+               push @out, "$_ = " . cldatetime($val);
        }
        return @out;
 }

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index eefa25816cac8181432d2edc9c5a3343d5ab40dd..8fb0f4664489609be8a6f3f56c584d6b6956d1fd 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -299,7 +299,7 @@ sub rcmd
        return  if !$noderef || !$noderef->pcversion;
 
        # send it 
-       DXProt::addrcmd($main::mycall, $call, $line);
+       DXProt::addrcmd($DXProt::me, $call, $line);
 }
 1;
 __END__

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index a9df0e913214c19e07a1978a7121b7a25acb7f1e..05aefeff05cf90ea7dd60441ff340db81561a091 100644 (file)
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -271,10 +271,13 @@ sub process
 
 sub listdups
 {
+       my $regex = shift;
+       $regex = '.*' unless $regex;
+       $regex =~ s/[\$\@\%]//g;
        my @out;
-       for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+       for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
                my $val = $dup{$_};
-               push @out, "$_ = $val (" . cldatetime($val) . ")";
+               push @out, "$_ = " . cldatetime($val);
        }
        return @out;
 }

diff --git a/perl/Spot.pm b/perl/Spot.pm
index b29592a3a756eb3c8d3c246e78e8ac3827445125..1e7de69a7b32a5f9dbe8ab2651528143984fb801 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -232,10 +232,13 @@ sub process
 
 sub listdups
 {
+       my $regex = shift;
+       $regex = '.*' unless $regex;
+       $regex =~ s/[\$\@\%]//g;
        my @out;
-       for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+       for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
                my $val = $dup{$_};
-               push @out, "$_ = $val (" . cldatetime($val) . ")";
+               push @out, "$_ = " . cldatetime($val);
        }
        return @out;
 }

diff --git a/perl/WCY.pm b/perl/WCY.pm
index 3645e25cb4dbd933525f03c49a1b39dca2480b1c..20b6a184274538fff31238586b6253911e4d46d6 100644 (file)
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -246,10 +246,13 @@ sub process
 
 sub listdups
 {
+       my $regex = shift;
+       $regex = '.*' unless $regex;
+       $regex =~ s/[\$\@\%]//g;
        my @out;
-       for (sort { $dup{$a} <=> $dup{$b} } keys %dup) {
+       for (sort { $dup{$a} <=> $dup{$b} } grep { m{$regex}i } keys %dup) {
                my $val = $dup{$_};
-               push @out, "$_ = $val (" . cldatetime($val) . ")";
+               push @out, "$_ = " . cldatetime($val);
        }
        return @out;
 }