define log_file_*_charset and modify log module to use it.

7 files changed, 100 insertions, 10 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index d9570d35..9983c9b8 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -375,6 +375,9 @@ log {
           $domain_local_log_file
           $log_dir
           $log_file
+    ?     $log_file_charset_en
+    ?     $log_file_charset_ja
+    ?     $log_file_default_charset
           $log_format_type
           $log_type
           $use_log
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index d9570d35..9983c9b8 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -375,6 +375,9 @@ log {
           $domain_local_log_file
           $log_dir
           $log_file
+    ?     $log_file_charset_en
+    ?     $log_file_charset_ja
+    ?     $log_file_default_charset
           $log_format_type
           $log_type
           $use_log
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 40a09b7e..eb5ed0ee 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -886,6 +886,28 @@ log_format_type	=	process[pid]
 #     Examples:
 log_dir		=	$var_dir/log
 
+
+=head2 charset
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_default_charset   =       $log_file_charset_en
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_ja        =       euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_en        =       us-ascii
+
+
 =head2 domain local
 
 
@@ -1157,21 +1179,21 @@ spool_dir	= $ml_home_dir/spool
 #      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
 
 =head1	convert article to html format.
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 9b7389b2..39946b57 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -903,6 +903,27 @@ log_format_type	=	process[pid]
 log_dir		=	$var_dir/log
 
 
+=head2 charset
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_default_charset   =       $log_file_charset_ja
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_ja        =       euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_en        =       us-ascii
+
+
 =head2 ドメイン固有
 
 
@@ -1183,21 +1204,21 @@ spool_type	= plane
 #      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
 
 =head1	記事を HTML 化する
 
diff --git a/fml/etc/src/config.cf.en/log.cf b/fml/etc/src/config.cf.en/log.cf
index 2afc3e48..d5642668 100644
--- a/fml/etc/src/config.cf.en/log.cf
+++ b/fml/etc/src/config.cf.en/log.cf
@@ -37,6 +37,28 @@ log_format_type	=	process[pid]
 #     Examples:
 log_dir		=	$var_dir/log
 
+
+=head2 charset
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_default_charset   =       $log_file_charset_en
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_ja        =       euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_en        =       us-ascii
+
+
 =head2 domain local
 
 
diff --git a/fml/etc/src/config.cf.ja/log.cf b/fml/etc/src/config.cf.ja/log.cf
index 2dd2e7b2..238aa447 100644
--- a/fml/etc/src/config.cf.ja/log.cf
+++ b/fml/etc/src/config.cf.ja/log.cf
@@ -40,6 +40,27 @@ log_format_type	=	process[pid]
 log_dir		=	$var_dir/log
 
 
+=head2 charset
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_default_charset   =       $log_file_charset_ja
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_ja        =       euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+log_file_charset_en        =       us-ascii
+
+
 =head2 ドメイン固有
 
 
diff --git a/fml/lib/FML/Command/Admin/log.pm b/fml/lib/FML/Command/Admin/log.pm
index c250fafd..89580351 100644
--- a/fml/lib/FML/Command/Admin/log.pm
+++ b/fml/lib/FML/Command/Admin/log.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: log.pm,v 1.19 2003/10/07 08:58:06 fukachan Exp $
+# $FML: log.pm,v 1.20 2003/10/15 08:16:24 fukachan Exp $
 #
 
 package FML::Command::Admin::log;
@@ -105,9 +105,7 @@ sub _show_log
     my $linecount    = 0;
     my $maxline      = 0;
     my $curproc      = $self->{ _curproc };
-    my $charset      = ($is_cgi ?
-			$curproc->get_charset("cgi") :
-			$curproc->language_default() );
+    my $charset      = $curproc->get_charset($is_cgi ? "cgi" : "log_file");
 
     use Mail::Message::Encode;
     my $obj = new Mail::Message::Encode;