From ba6bde3b43fc7a057fb8d0d7752eac3745a24893 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 2 Jul 2002 23:16:53 +0000
Subject: make a private [rm]list showing all remailers

---
 Echolot/Config.pm |  3 ++-
 Echolot/Stats.pm  | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'Echolot')

diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index d3b2537..7c98535 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
 package Echolot::Config;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.9 2002/07/02 18:15:26 weasel Exp $
+# $Id: Config.pm,v 1.10 2002/07/02 23:16:53 weasel Exp $
 #
 
 =pod
@@ -47,6 +47,7 @@ sub init($) {
 		getkeyconf                  => 24*60*60, # daily
 		
 		resultdir                   => 'results',
+		private_resultdir           => 'results.private',
 		gnupghome                   => 'gnupg',
 		tmpdir                      => 'tmp',
 		prospective_addresses_ttl   => 432000, # 5 days
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index ea91066..e1b68bb 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -1,7 +1,7 @@
 package Echolot::Stats;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Stats.pm,v 1.8 2002/07/02 18:03:55 weasel Exp $
+# $Id: Stats.pm,v 1.9 2002/07/02 23:16:53 weasel Exp $
 #
 
 =pod
@@ -262,7 +262,7 @@ sub calculate($$) {
 sub build_mlist1($$) {
 	my ($rems, $filebasename) = @_;
 
-	my $filename = Echolot::Config::get()->{'resultdir'}.'/'.$filebasename.'.txt';
+	my $filename = $filebasename.'.txt';
 	open(F, '>'.$filename) or
 		cluck("Cannot open $filename: $!\n"),
 		return 0;
@@ -283,7 +283,7 @@ sub build_mlist1($$) {
 sub build_rlist1($$) {
 	my ($rems, $filebasename) = @_;
 
-	my $filename = Echolot::Config::get()->{'resultdir'}.'/'.$filebasename.'.txt';
+	my $filename = $filebasename.'.txt';
 	open(F, '>'.$filename) or
 		cluck("Cannot open $filename: $!\n"),
 		return 0;
@@ -317,7 +317,7 @@ sub build_rlist1($$) {
 sub build_list2($$) {
 	my ($rems, $filebasename) = @_;
 
-	my $filename = Echolot::Config::get()->{'resultdir'}.'/'.$filebasename.'.txt';
+	my $filename = $filebasename.'.txt';
 	open(F, '>'.$filename) or
 		cluck("Cannot open $filename: $!\n"),
 		return 0;
@@ -384,14 +384,18 @@ sub build_rems($) {
 sub build_lists() {
 
 	my $rems = build_rems(['mix']);
-	my @rems = grep { $_->{'showit'} } @$rems;
-	build_mlist1( \@rems, 'mlist');
-	build_list2( \@rems, 'mlist2');
+	build_mlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'mlist');
+	build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'mlist2');
+	@$rems = grep { $_->{'showit'} } @$rems;
+	build_mlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'mlist');
+	build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'mlist2');
 
 	$rems = build_rems(['cpunk-rsa', 'cpunk-dsa', 'cpunk-clear']);
-	@rems = grep { $_->{'showit'} } @$rems;
-	build_rlist1( \@rems, 'rlist');
-	build_list2( \@rems, 'rlist2');
+	build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist');
+	build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2');
+	@$rems = grep { $_->{'showit'} } @$rems;
+	build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist');
+	build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2');
 };
 
 
-- 
cgit v1.2.3