From: minima <minima>
Date: Mon, 14 Aug 2000 20:37:57 +0000 (+0000)
Subject: and again
X-Git-Tag: R_1_44~35
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=261c75481017f32ca491df475b36e9600ca430a1;p=spider.git

and again
---

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index ddb59a4c..a6032363 100644
--- 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 eefa2581..8fb0f466 100644
--- 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 a9df0e91..05aefeff 100644
--- 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 b29592a3..1e7de69a 100644
--- 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 3645e25c..20b6a184 100644
--- 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;
 }