--computer-output -> --log-computer-output

$*computer_output -> $*log_computer_output

4 files changed, 18 insertions, 18 deletions

diff --git a/fml/etc/command_line_options b/fml/etc/command_line_options
index cdabf05e..81817730 100644
--- a/fml/etc/command_line_options
+++ b/fml/etc/command_line_options
@@ -1,5 +1,5 @@
 #
-# $FML: command_line_options,v 1.6 2003/09/19 13:10:12 fukachan Exp $
+# $FML: command_line_options,v 1.7 2003/11/29 08:18:19 fukachan Exp $
 #
 # map between programs and options
 #
@@ -16,7 +16,7 @@ error		debug! help! params=s -c=s
 mead		debug! help! params=s -c=s
 
 # bin/
-fml		debug! help! force! log-dup! computer-output! quiet! q! params=s -c=s
+fml		debug! help! force! log-dup! log-computer-output! quiet! q! params=s -c=s
 fmladdr		debug! help! n! -c=s
 fmlalias	debug! help! n! -c=s
 fmlconf		debug! help! n! -c=s params=s
@@ -25,7 +25,7 @@ fmlerror	debug! help!
 fmlhtmlify	debug! help! -I=s
 fmlspool	debug! help! -I=s convert! style=s srcdir=s
 fmlthread	debug! help! article_id_max=i spool_dir=s base_url=s msg_base_url=s reverse! params=s -f=s -c=s
-makefml		debug! help! force! log-dup! computer-output! quiet! q! params=s -c=s
+makefml		debug! help! force! log-dup! log-computer-output! quiet! q! params=s -c=s
 
 # cgi-bin/
 config.cgi		
diff --git a/fml/etc/src/config.cf.en/log.cf b/fml/etc/src/config.cf.en/log.cf
index 3a1a5b87..71f43aa9 100644
--- a/fml/etc/src/config.cf.en/log.cf
+++ b/fml/etc/src/config.cf.en/log.cf
@@ -75,15 +75,15 @@ domain_local_log_file	=	$domain_local_dir/@log@
 
 
 # Descriptions: if yes, makefml/fml outputs machine friendly log.
-#               --coputer-output option implies "use_computer_output = yes".
+#               --coputer-output option implies "use_log_computer_output = yes".
 #      History: none
 #        Value: yes | no
 #     Examples: no
-use_computer_output	=	no
+use_log_computer_output	=	no
 
 
 # Descriptions: specify perl module for output engine.
 #      History: none
 #        Value: CLASS
 #     Examples: FML::Log::Print::Simple
-computer_output_engine	=	FML::Log::Print::Simple
+log_computer_output_engine	=	FML::Log::Print::Simple
diff --git a/fml/etc/src/config.cf.ja/log.cf b/fml/etc/src/config.cf.ja/log.cf
index d3f00abd..af0ea94e 100644
--- a/fml/etc/src/config.cf.ja/log.cf
+++ b/fml/etc/src/config.cf.ja/log.cf
@@ -76,12 +76,12 @@ domain_local_log_file	=	$domain_local_dir/@log@
 
 
 # Descriptions: 機会処理にやさしいフォーマットでログを出力する。
-#               コマンドラインオプションで --computer-output を指定すると
-#               use_computer_output = yes と同じ意味になる。
+#               コマンドラインオプションで --log-computer-output を指定すると
+#               use_log_computer_output = yes と同じ意味になる。
 #      History: none
 #        Value: yes | no
 #     Examples: no
-use_computer_output	=	no
+use_log_computer_output	=	no
 
 
 # Descriptions: 機会処理にやさしいフォーマットを出力する際の出力エンジン。
@@ -89,4 +89,4 @@ use_computer_output	=	no
 #      History: none
 #        Value: CLASS
 #     Examples: FML::Log::Print::Simple
-computer_output_engine	=	FML::Log::Print::Simple
+log_computer_output_engine	=	FML::Log::Print::Simple
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 25a826f3..0a602ca7 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.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: Kernel.pm,v 1.193 2003/11/29 08:18:20 fukachan Exp $
+# $FML: Kernel.pm,v 1.194 2003/11/29 10:24:29 fukachan Exp $
 #
 
 package FML::Process::Kernel;
@@ -1146,7 +1146,7 @@ sub log_message_init
 {
     my ($curproc) = @_;
     my $config    = $curproc->config();
-    my $module    = $config->{ computer_output_engine };
+    my $module    = $config->{ log_computer_output_engine };
     my $obj       = undef;
 
     eval qq{
@@ -1159,7 +1159,7 @@ sub log_message_init
 	$curproc->{ log_message_queue } = $obj;
     }
     else {
-	$curproc->logerror("fail to create computer_output_engine object");
+	$curproc->logerror("fail to create log_computer_output_engine object");
     }
 }
 
@@ -2365,7 +2365,7 @@ sub _reopen_stderr_channel
 	$curproc->is_under_mta_process() ||
 	defined $option->{ quiet }  || defined $option->{ q } ||
 	$config->yes('use_log_dup') || $option->{ 'log-dup' } ||
-	$config->yes('use_computer_output') || $option->{'computer-output'}) {
+	$config->yes('use_log_computer_output') || $option->{'log-computer-output'}) {
 	my $tmpfile = $curproc->temp_file_path();
 	my $pcb     = $curproc->pcb();
 	$pcb->set("stderr", "logfile", $tmpfile);
@@ -2399,8 +2399,8 @@ sub _finalize_stderr_channel
 	    $curproc->is_under_mta_process() ||
 	    defined $option->{ quiet }  || defined $option->{ q } ||
 	    $config->yes('use_log_dup') || $option->{ 'log-dup' } ||
-	    $config->yes('use_computer_output') ||
-	    $option->{'computer-output'}) {
+	    $config->yes('use_log_computer_output') ||
+	    $option->{'log-computer-output'}) {
 
 	    close(STDERR);
 	    open(STDERR, ">&STDOUT");
@@ -2476,7 +2476,7 @@ sub be_quiet
 	$curproc->is_under_mta_process() ||
 	defined $option->{ quiet }  || defined $option->{ q } ||
 	$config->yes('use_log_dup') || $option->{ 'log-dup' } ||
-	$config->yes('use_computer_output') || $option->{'computer-output'}) {
+	$config->yes('use_log_computer_output') || $option->{'log-computer-output'}) {
 	return 1;
     }
     else {
@@ -2497,7 +2497,7 @@ sub finalize
     my $option    = $curproc->command_line_options();
 
     if ($config->yes('use_log_dup') || $option->{ 'log-dup' } ||
-	$config->yes('use_computer_output') || $option->{'computer-output'}) {
+	$config->yes('use_log_computer_output') || $option->{'log-computer-output'}) {
 	$curproc->_finalize_stderr_channel();
 	$curproc->_log_message_print();
     }