Mail::Message::Spool::spool arg changes: $spool_dir -> $base_dir

7 files changed, 44 insertions, 37 deletions

diff --git a/fml/lib/FML/Article.pm b/fml/lib/FML/Article.pm
index e09c9634..450b2405 100644
--- a/fml/lib/FML/Article.pm
+++ b/fml/lib/FML/Article.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Article.pm,v 1.31 2002/03/30 13:48:25 fukachan Exp $
+# $FML: Article.pm,v 1.32 2002/03/30 15:29:42 fukachan Exp $
 #
 
 package FML::Article;
@@ -188,7 +188,7 @@ return article file path.
 
 
 # Descriptions: return article file path.
-#    Arguments: OBJ($self) OBJ($curproc) NUM($id)
+#    Arguments: OBJ($self) NUM($id)
 # Side Effects: none
 # Return Value: STR(file path)
 sub filepath
@@ -201,8 +201,8 @@ sub filepath
     use Mail::Message::Spool;
     my $spool = new Mail::Message::Spool;
     my $file  = $spool->filepath( {
-	spool_dir => $spool_dir,
-	id        => $id,
+	base_dir => $spool_dir,
+	id       => $id,
     } );
 
     Log("debug: spooled path = $file");
diff --git a/fml/lib/Mail/Message/Spool.pm b/fml/lib/Mail/Message/Spool.pm
index 3a0ff5cf..1b91303c 100644
--- a/fml/lib/Mail/Message/Spool.pm
+++ b/fml/lib/Mail/Message/Spool.pm
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002 Ken'ichi Fukamachi
 #
-# $FML: Spool.pm,v 1.3 2002/12/24 02:26:34 fukachan Exp $
+# $FML: Spool.pm,v 1.1 2002/03/30 15:29:43 fukachan Exp $
 #
 
 package Mail::Message::Spool;
@@ -46,7 +46,7 @@ sub new
 return article file path.
 
    $args = {
-	spool_dir  => $spool_dir, 
+	base_dir   => $base_dir, 
 	id         => $id,
 	use_subdir => 0,    # 1 or 0
    };
@@ -62,22 +62,22 @@ sub filepath
 {
     my ($self, $args) = @_;
 
-    if (defined $args->{ spool_dir } && defined $args->{ id }) {
-	my $spool_dir = $args->{ spool_dir };
-	my $id        = $args->{ id };
-	my $is_hash   = 0;
-	my $file      = '';
-	my $unit      = 1000;
-	my $subdir    = int($id/$unit);
+    if (defined $args->{ base_dir } && defined $args->{ id }) {
+	my $base_dir = $args->{ base_dir };
+	my $id       = $args->{ id };
+	my $is_hash  = 0;
+	my $file     = '';
+	my $unit     = 1000;
+	my $subdir   = int($id/$unit);
 
 	if (defined $args->{ use_subdir }) {
 	    $is_hash = 1;
 	    use File::Spec;
-	    $file = File::Spec->catfile($spool_dir, $subdir, $id);
+	    $file = File::Spec->catfile($base_dir, $subdir, $id);
 	}
 	else {
 	    use File::Spec;
-	    $file = File::Spec->catfile($spool_dir, $id);
+	    $file = File::Spec->catfile($base_dir, $id);
 	}
 
 	return $file;
@@ -100,7 +100,7 @@ if ($0 eq __FILE__) {
 		       )) {
 	    print "$id\t=>\t";
 	    print $obj->filepath({
-		spool_dir  => '/var/spool/ml/elena/spool',
+		base_dir   => '/var/spool/ml/elena/spool',
 		id         => $id,
 		use_subdir => $is_hash,
 	    }), "\n";
diff --git a/fml/lib/Mail/ThreadTrack.pm b/fml/lib/Mail/ThreadTrack.pm
index e636b1dc..22affc88 100755
--- a/fml/lib/Mail/ThreadTrack.pm
+++ b/fml/lib/Mail/ThreadTrack.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: ThreadTrack.pm,v 1.24 2001/12/26 14:23:29 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.25 2002/03/31 01:59:00 fukachan Exp $
 #
 
 package Mail::ThreadTrack;
@@ -504,10 +504,17 @@ sub log
 
 return article file path.
 
+   $args = {
+	base_dir   => DIR,
+	id         => NUM,
+	use_subdir => 1 or 0,
+   };
+
 =cut
 
-# Descriptions: return article file path.
-#    Arguments: OBJ($self) OBJ($curproc) NUM($id)
+
+# Descriptions: return the article file path.
+#    Arguments: OBJ($self) HASH_REF($args)
 # Side Effects: none
 # Return Value: STR(file path)
 sub filepath
@@ -528,7 +535,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001 Ken'ichi Fukamachi
+Copyright (C) 2001,2002 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/Mail/ThreadTrack/DB.pm b/fml/lib/Mail/ThreadTrack/DB.pm
index 46f5c9e2..40c62d44 100644
--- a/fml/lib/Mail/ThreadTrack/DB.pm
+++ b/fml/lib/Mail/ThreadTrack/DB.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: DB.pm,v 1.24 2002/02/17 03:13:50 fukachan Exp $
+# $FML: DB.pm,v 1.25 2002/03/31 01:59:00 fukachan Exp $
 #
 
 package Mail::ThreadTrack::DB;
@@ -194,8 +194,8 @@ sub db_mkdb
 
 	# analyze
 	my $file = $self->filepath({
-	    spool_dir => $spool_dir,
-	    id        => $id,
+	    baes_dir => $spool_dir,
+	    id       => $id,
 	});
 	my $fh   = new FileHandle $file;
 	next unless (defined $fh);	# for file missing
diff --git a/fml/lib/Mail/ThreadTrack/Print.pm b/fml/lib/Mail/ThreadTrack/Print.pm
index 0295b5d0..10c9d35a 100644
--- a/fml/lib/Mail/ThreadTrack/Print.pm
+++ b/fml/lib/Mail/ThreadTrack/Print.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Print.pm,v 1.21 2002/01/13 21:59:08 fukachan Exp $
+# $FML: Print.pm,v 1.22 2002/03/31 01:59:01 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Print;
@@ -305,8 +305,8 @@ sub _do_review
 		    }
 
 		    my $file = $self->filepath({
-			spool_dir => $spool_dir,
-			id        => $aid,
+			base_dir => $spool_dir,
+			id       => $aid,
 		    });
 		    if (-f $file) {
 			$self->print(  $self->message_summary($file) );
diff --git a/fml/lib/Mail/ThreadTrack/Print/HTML.pm b/fml/lib/Mail/ThreadTrack/Print/HTML.pm
index 6ddd959a..10ad2c92 100644
--- a/fml/lib/Mail/ThreadTrack/Print/HTML.pm
+++ b/fml/lib/Mail/ThreadTrack/Print/HTML.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: HTML.pm,v 1.9 2002/01/13 14:51:25 fukachan Exp $
+# $FML: HTML.pm,v 1.10 2002/03/31 01:59:01 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Print::HTML;
@@ -64,8 +64,8 @@ sub show_articles_in_thread
 	my $s = '';
 	for (split(/\s+/, $articles)) {
 	    my $file = $self->filepath({
-		spool_dir => $spool_dir,
-		id        => $_,
+		base_dir => $spool_dir,
+		id       => $_,
 	    });
 	    my $fh   = new FileHandle $file;
 	    while (defined($_ = $fh->getline())) {
@@ -218,8 +218,8 @@ sub __print_thread_summary
     if (defined $articles) {
 	$aid = (split(/\s+/, $articles))[0];
 	my $f = $self->filepath({
-	    spool_dir => $spool_dir,
-	    id        => $aid,
+	    base_dir => $spool_dir,
+	    id       => $aid,
 	});
 	if (-f $f) {
 	    my $buf = $self->message_summary($f);
diff --git a/fml/lib/Mail/ThreadTrack/Print/Text.pm b/fml/lib/Mail/ThreadTrack/Print/Text.pm
index aeda5f9b..daf061d5 100644
--- a/fml/lib/Mail/ThreadTrack/Print/Text.pm
+++ b/fml/lib/Mail/ThreadTrack/Print/Text.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Text.pm,v 1.7 2002/01/13 15:19:53 fukachan Exp $
+# $FML: Text.pm,v 1.8 2002/03/31 01:59:01 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Print::Text;
@@ -55,8 +55,8 @@ sub show_articles_in_thread
 	my $s = '';
 	for my $id (split(/\s+/, $articles)) {
 	    my $file = $self->filepath({
-		spool_dir => $spool_dir,
-		id        => $id,
+		base_dir => $spool_dir,
+		id       => $id,
 	    });
 	    my $fh   = new FileHandle $file;
 	    while (defined($_ = $fh->getline())) {
@@ -170,8 +170,8 @@ sub __print_message_summary
 		(@aid) = split(/\s+/, $rh->{ _articles }->{ $thread_id });
 		$aid  = $aid[0];
 		$file = $self->filepath({
-		    spool_dir => $spool_dir,
-		    id        => $aid,
+		    base_dir => $spool_dir,
+		    id       => $aid,
 		});
 		if (-f $file) {
 		    $self->print(  $self->message_summary($file) );