diff options
| author | fukachan <fukachan> | 2002-02-02 15:24:18 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2002-02-02 15:24:18 +0000 |
| commit | 092dc3c65a00347d9d7f9684c415592db515d4a7 (patch) | |
| tree | d4fc97e156a6f6623d139738b4f178ce13b5f654 | |
| parent | ea70acb3c9c2992fde5ea134352889f223a388c8 (diff) | |
| download | fml8-092dc3c65a00347d9d7f9684c415592db515d4a7.tar.gz fml8-092dc3c65a00347d9d7f9684c415592db515d4a7.tar.bz2 fml8-092dc3c65a00347d9d7f9684c415592db515d4a7.zip | |
use FML::Process::Utils::__ml_home_prefix_from_main_cf() to get $ml_home_prefix.
| -rw-r--r-- | fml/lib/FML/Process/CGI/Kernel.pm | 5 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Switch.pm | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index 79ca554e..d628a71c 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/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.13 2002/01/30 15:20:30 fukachan Exp $ +# $FML: Kernel.pm,v 1.14 2002/02/01 12:03:57 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -63,7 +63,8 @@ sub new # we should get $ml_name from HTTP. if ($is_need_ml_name) { - my $ml_home_prefix = $args->{ ml_home_prefix }; + use FML::Process::Utils; + my $ml_home_prefix = FML::Process::Utils::__ml_home_prefix_from_main_cf($args); my $ml_name = safe_param_ml_name($self) || do { croak("not get ml_name from HTTP") if $args->{ need_ml_name }; }; diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm index 7e43c83f..443f0fca 100644 --- a/fml/lib/FML/Process/Switch.pm +++ b/fml/lib/FML/Process/Switch.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: Switch.pm,v 1.51 2002/01/30 15:12:44 fukachan Exp $ +# $FML: Switch.pm,v 1.52 2002/02/01 12:03:57 fukachan Exp $ # package FML::Process::Switch; @@ -148,12 +148,14 @@ sub main::Bootstrap2 } # 5. o.k. here we go! + use FML::Process::Utils; + my $ml_home_prefix = FML::Process::Utils::__ml_home_prefix_from_main_cf($main_cf); my $args = { fml_version => $main_cf->{ fml_version }, myname => $myname, program_name => $myname, - ml_home_prefix => $main_cf->{ ml_home_prefix }, + ml_home_prefix => $ml_home_prefix, ml_home_dir => $main_cf->{ ml_home_dir }, cf_list => $cf, @@ -215,7 +217,8 @@ sub _parse_argv sub _usual_parse_argv { my ($myname, $main_cf) = @_; - my $ml_home_prefix = $main_cf->{ ml_home_prefix }; + use FML::Process::Utils; + my $ml_home_prefix = FML::Process::Utils::__ml_home_prefix_from_main_cf($main_cf); my $ml_home_dir = ''; my $found_cf = 0; my @cf = (); @@ -263,7 +266,8 @@ sub _usual_parse_argv sub _makefml_parse_argv { my ($myname, $main_cf) = @_; - my $ml_home_prefix = $main_cf->{ ml_home_prefix }; + use FML::Process::Utils; + my $ml_home_prefix = FML::Process::Utils::__ml_home_prefix_from_main_cf($main_cf); # makefml specific syntax. if (@ARGV) { |