summary_file -> article_summary_file

summary_format_style            -> article_summary_file_format_style
summary_format_address_length   -> article_summary_file_format_address_length

4 files changed, 24 insertions, 24 deletions

diff --git a/fml/etc/src/config.cf.en/summary.cf b/fml/etc/src/config.cf.en/summary.cf
index 8a317081..772bdf3f 100644
--- a/fml/etc/src/config.cf.en/summary.cf
+++ b/fml/etc/src/config.cf.en/summary.cf
@@ -4,18 +4,18 @@
 #      History:
 #        Value:
 #     Examples:
-summary_file		=	$ml_home_dir/summary
+article_summary_file		=	$ml_home_dir/summary
 
 
 # Descriptions: format style.
 #      History:
 #        Value: fml4_compatible
 #     Examples:
-summary_format_style	=	fml4_compatible
+article_summary_file_format_style	=	fml4_compatible
 
 
 # Descriptions: save the first N bytes of the address in summary.
 #      History:
 #        Value: \d+
 #     Examples: 15
-summary_format_address_length	=	15
+article_summary_file_format_address_length	=	15
diff --git a/fml/etc/src/config.cf.ja/summary.cf b/fml/etc/src/config.cf.ja/summary.cf
index 421fc33f..55af6980 100644
--- a/fml/etc/src/config.cf.ja/summary.cf
+++ b/fml/etc/src/config.cf.ja/summary.cf
@@ -4,18 +4,18 @@
 #      History:
 #        Value:
 #     Examples:
-summary_file		=	$ml_home_dir/summary
+article_summary_file		=	$ml_home_dir/summary
 
 
 # Descriptions:
 #      History:
 #        Value: fml4_compatible
 #     Examples:
-summary_format_style	=	fml4_compatible
+article_summary_file_format_style	=	fml4_compatible
 
 
 # Descriptions: アドレスは先頭の何バイトかだけを記録する。詳しくはログ見ろ
 #      History:
 #        Value: \d+
 #     Examples: 15
-summary_format_address_length	=	15
+article_summary_file_format_address_length	=	15
diff --git a/fml/lib/FML/Article/Summary.pm b/fml/lib/FML/Article/Summary.pm
index 85cee211..069988b9 100644
--- a/fml/lib/FML/Article/Summary.pm
+++ b/fml/lib/FML/Article/Summary.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: Summary.pm,v 1.13 2003/08/23 04:35:28 fukachan Exp $
+# $FML: Summary.pm,v 1.14 2003/08/23 14:37:59 fukachan Exp $
 #
 
 package FML::Article::Summary;
@@ -47,16 +47,16 @@ sub new
 }
 
 
-# Descriptions: append summary to $summary_file
+# Descriptions: append summary to $article_summary_file
 #    Arguments: OBJ($self) HANDLE($wh) NUM($id)
-# Side Effects: append summary to $summary_file
+# Side Effects: append summary to $article_summary_file
 # Return Value: none
 sub print
 {
     my ($self, $wh, $id) = @_;
     my $curproc = $self->{ _curproc };
     my $config  = $curproc->config();
-    my $file    = $config->{ 'summary_file' };
+    my $file    = $config->{ 'article_summary_file' };
 
     # XXX last resort == STDOUT.
     $wh ||= \*STDOUT;
@@ -81,7 +81,7 @@ sub _prepare_info
     my $curproc = $self->{ _curproc };
     my $config  = $curproc->config();
     my $tag     = $config->{ article_subject_tag };
-    my $addrlen = $config->{ summary_format_address_length };
+    my $addrlen = $config->{ article_summary_file_format_address_length };
     my $article = undef;
 
     if (defined $self->{ _article }) {
@@ -146,20 +146,20 @@ sub print_one_line_summary
     my ($self, $wh, $info) = @_;
     my $curproc = $self->{ _curproc };
     my $config  = $curproc->config();
-    my $style   = $config->{ 'summary_format_style' };
+    my $style   = $config->{ 'article_summary_file_format_style' };
 
     if ($style eq 'fml4_compatible') {
 	$self->_fml4_compatible_style_one_line_summary($wh, $info);
     }
     else {
-	$curproc->logerror("unknown \$summary_file_style: $style");
+	$curproc->logerror("unknown \$article_summary_file_style: $style");
     }
 }
 
 
-# Descriptions: write out formatted string into $summary_file.
+# Descriptions: write out formatted string into $article_summary_file.
 #    Arguments: OBJ($self) HANDLE($wh) HASH_REF($info)
-# Side Effects: update $summary_file.
+# Side Effects: update $article_summary_file.
 # Return Value: none
 sub _fml4_compatible_style_one_line_summary
 {
@@ -205,7 +205,7 @@ sub append
     my ($self, $article, $id) = @_;
     my $curproc = $self->{ _curproc };
     my $config  = $curproc->config();
-    my $file    = $config->{ 'summary_file' };
+    my $file    = $config->{ 'article_summary_file' };
 
     if (defined $article) {
 	$self->{ _article } = $article;
@@ -230,7 +230,7 @@ sub rebuild
     my ($self, $min, $max) = @_;
     my $curproc = $self->{ _curproc };
     my $config  = $curproc->config();
-    my $file    = $config->{ 'summary_file' };
+    my $file    = $config->{ 'article_summary_file' };
     my $tmp     = "$file.new.$$";
 
     use FileHandle;
@@ -263,10 +263,10 @@ sub dump
     my ($self, $wh) = @_;
     my $curproc      = $self->{ _curproc };
     my $config       = $curproc->config();
-    my $summary_file = $config->{ "summary_file" };
+    my $article_summary_file = $config->{ "article_summary_file" };
 
-    if (-f $summary_file) {
-	my $fh = new FileHandle $summary_file;
+    if (-f $article_summary_file) {
+	my $fh = new FileHandle $article_summary_file;
 	if (defined $fh && defined $wh) {
 	    my $buf;
 	    while ($buf = <$fh>) { print $wh $buf;}
diff --git a/fml/lib/FML/Command/User/summary.pm b/fml/lib/FML/Command/User/summary.pm
index 785235e0..034856b7 100644
--- a/fml/lib/FML/Command/User/summary.pm
+++ b/fml/lib/FML/Command/User/summary.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: summary.pm,v 1.15 2003/08/23 04:35:33 fukachan Exp $
+# $FML: summary.pm,v 1.16 2003/08/29 15:34:01 fukachan Exp $
 #
 
 package FML::Command::User::summary;
@@ -71,10 +71,10 @@ sub process
 {
     my ($self, $curproc, $command_args) = @_;
     my $config       = $curproc->config();
-    my $summary_file = $config->{ "summary_file" };
+    my $article_summary_file = $config->{ "article_summary_file" };
 
-    if (-f $summary_file) {
-	$command_args->{ _filepath_to_send } = $summary_file;
+    if (-f $article_summary_file) {
+	$command_args->{ _filepath_to_send } = $article_summary_file;
 	$self->send_file($curproc, $command_args);
     }
     else {