bug fix definitions on hooks

6 files changed, 46 insertions, 35 deletions

diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm
index 01a59f43..d3518609 100644
--- a/fml/lib/FML/Process/ConfViewer.pm
+++ b/fml/lib/FML/Process/ConfViewer.pm
@@ -1,9 +1,9 @@
 #-*- perl -*-
 #
-# Copyright (C) 2000,2001 Ken'ichi Fukamachi
+# Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: ConfViewer.pm,v 1.7 2001/12/22 14:25:24 fukachan Exp $
+# $FML: ConfViewer.pm,v 1.8 2002/02/17 03:07:55 fukachan Exp $
 #
 
 package FML::Process::ConfViewer;
@@ -64,6 +64,7 @@ sub new
 sub prepare
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlconf_prepare_start_hook' );
     if ($eval) {
@@ -88,6 +89,7 @@ sub verify_request
 {
     my ($curproc, $args) = @_;
     my $argv = $curproc->command_line_argv();
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlconf_verify_request_start_hook' );
     if ($eval) {
@@ -186,6 +188,7 @@ _EOF_
 sub finish
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlconf_finish_start_hook' );
     if ($eval) {
@@ -228,7 +231,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001 Ken'ichi Fukamachi
+Copyright (C) 2000,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/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm
index cbf27d50..b6e6834d 100644
--- a/fml/lib/FML/Process/Configure.pm
+++ b/fml/lib/FML/Process/Configure.pm
@@ -1,9 +1,9 @@
 #-*- perl -*-
 #
-# Copyright (C) 2000,2001 Ken'ichi Fukamachi
+# Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Configure.pm,v 1.35 2001/12/22 14:25:24 fukachan Exp $
+# $FML: Configure.pm,v 1.36 2002/02/17 03:07:55 fukachan Exp $
 #
 
 package FML::Process::Configure;
@@ -68,6 +68,9 @@ sub new
 # Return Value: none
 sub prepare
 {
+    my ($curproc, $args) = @_;
+    my $config = $curproc->{ config };
+
     my $eval = $config->get_hook( 'makefml_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
 
@@ -86,6 +89,7 @@ sub verify_request
     my ($curproc, $args) = @_;
     my $argv = $curproc->command_line_argv();
     my $len  = $#$argv + 1;
+    my $config = $curproc->{ config };
 
     my $eval = $config->get_hook( 'makefml_verify_request_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -135,7 +139,17 @@ sub run
 #    Arguments: OBJ($self) HASH_REF($args)
 # Side Effects: none
 # Return Value: none
-sub finish { 1;}
+sub finish
+{
+    my ($curproc, $args) = @_;
+    my $config = $curproc->{ config };
+
+    my $eval = $config->get_hook( 'makefml_finish_start_hook' );
+    if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
+
+    $eval = $config->get_hook( 'makefml_finish_end_hook' );
+    if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
+}
 
 
 =head2 help()
@@ -242,37 +256,13 @@ sub _makefml
 }
 
 
-=head2 finish()
-
-finalize.
-
-=cut
-
-
-# Descriptions: clean up in the end of the curreen process.
-#               return error messages et. al.
-#    Arguments: OBJ($curproc) HASH_REF($args)
-# Side Effects: queue flush
-# Return Value: none
-sub finish
-{
-    my ($curproc, $args) = @_;
-
-    my $eval = $config->get_hook( 'makefml_finish_start_hook' );
-    if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
-
-    $eval = $config->get_hook( 'makefml_finish_end_hook' );
-    if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
-}
-
-
 =head1 AUTHOR
 
 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/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index f9d8d2b6..26968599 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Distribute.pm,v 1.63 2002/01/16 13:43:20 fukachan Exp $
+# $FML: Distribute.pm,v 1.64 2002/02/17 03:07:55 fukachan Exp $
 #
 
 package FML::Process::Distribute;
@@ -74,6 +74,7 @@ forward the request to the base class.
 sub prepare
 {
     my ($self, $args) = @_;
+    my $config = $self->{ config };
 
     my $eval = $config->get_hook( 'distribute_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -99,6 +100,7 @@ check the mail sender and the mail loop possibility.
 sub verify_request
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config };
 
     my $eval = $config->get_hook( 'distribute_verify_request_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -133,6 +135,7 @@ Lastly we unlock the current process.
 sub run
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config };
 
     my $eval = $config->get_hook( 'distribute_run_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -191,6 +194,7 @@ If needed, we send back error messages to the mail sender.
 sub finish
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config };
 
     my $eval = $config->get_hook( 'distribute_finish_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm
index afdfa4cb..8410fdf8 100644
--- a/fml/lib/FML/Process/DocViewer.pm
+++ b/fml/lib/FML/Process/DocViewer.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: DocViewer.pm,v 1.12 2001/12/22 14:40:34 fukachan Exp $
+# $FML: DocViewer.pm,v 1.13 2002/02/17 03:07:56 fukachan Exp $
 #
 
 package FML::Process::DocViewer;
@@ -70,6 +70,7 @@ sub new
 sub prepare
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmldoc_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -88,6 +89,7 @@ sub verify_request
 {
     my ($curproc, $args) = @_;
     my $argv = $curproc->command_line_argv();
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmldoc_verify_request_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -205,6 +207,7 @@ finalize.
 sub finish
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmldoc_finish_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm
index bba50378..5ad81241 100644
--- a/fml/lib/FML/Process/HTMLify.pm
+++ b/fml/lib/FML/Process/HTMLify.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: HTMLify.pm,v 1.9 2002/02/02 08:04:53 fukachan Exp $
+# $FML: HTMLify.pm,v 1.10 2002/02/17 03:07:56 fukachan Exp $
 #
 
 package FML::Process::HTMLify;
@@ -65,6 +65,9 @@ sub new
 # Return Value: none
 sub prepare
 {
+    my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
+
     my $eval = $config->get_hook( 'fmlhtmlify_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
 
@@ -79,6 +82,9 @@ sub prepare
 # Return Value: none
 sub verify_request
 {
+    my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
+
     my $eval = $config->get_hook( 'fmlhtmlify_verify_request_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
 
@@ -100,6 +106,7 @@ call the actual thread tracking system.
 sub run
 {
     my ($curproc, $args) = @_;
+    my $config  = $curproc->{ config }; 
     my $argv    = $curproc->command_line_argv();
     my $options = $curproc->command_line_options();
     my $src_dir = $argv->[0];
@@ -171,6 +178,7 @@ _EOF_
 sub finish
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlhtmlify_finish_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/ThreadTrack.pm b/fml/lib/FML/Process/ThreadTrack.pm
index 6966dbdf..1f1107d2 100644
--- a/fml/lib/FML/Process/ThreadTrack.pm
+++ b/fml/lib/FML/Process/ThreadTrack.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: ThreadTrack.pm,v 1.21 2002/02/04 14:15:05 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.22 2002/02/17 03:07:56 fukachan Exp $
 #
 
 package FML::Process::ThreadTrack;
@@ -64,6 +64,7 @@ sub new
 sub prepare
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlthread_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -81,6 +82,7 @@ sub verify_request
 {
     my ($curproc, $args) = @_;
     my $argv = $curproc->command_line_argv();
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlthread_verify_request_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -381,6 +383,7 @@ _EOF_
 sub finish
 {
     my ($curproc, $args) = @_;
+    my $config = $curproc->{ config }; 
 
     my $eval = $config->get_hook( 'fmlthread_finish_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }