diff options
| author | fukachan <fukachan> | 2003-07-19 12:58:47 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-07-19 12:58:47 +0000 |
| commit | 9bdbcfee3a4294312970d3a0efbea7d20ac1c8a6 (patch) | |
| tree | 02c7b2f9eb15c4ee134f6b01efbb35d3a74e4a71 /fml/lib/FML | |
| parent | a2a8d46666f91fd4e106f24d610c60ec16a99a30 (diff) | |
| download | fml8-9bdbcfee3a4294312970d3a0efbea7d20ac1c8a6.tar.gz fml8-9bdbcfee3a4294312970d3a0efbea7d20ac1c8a6.tar.bz2 fml8-9bdbcfee3a4294312970d3a0efbea7d20ac1c8a6.zip | |
fixed to co-work with udb well.
Diffstat (limited to 'fml/lib/FML')
| -rw-r--r-- | fml/lib/FML/Command/HTMLify.pm | 14 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Distribute.pm | 13 |
2 files changed, 21 insertions, 6 deletions
diff --git a/fml/lib/FML/Command/HTMLify.pm b/fml/lib/FML/Command/HTMLify.pm index 7ef68c92..34762031 100644 --- a/fml/lib/FML/Command/HTMLify.pm +++ b/fml/lib/FML/Command/HTMLify.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: HTMLify.pm,v 1.15 2003/01/11 16:05:14 fukachan Exp $ +# $FML: HTMLify.pm,v 1.16 2003/02/16 08:33:09 fukachan Exp $ # package FML::Command::HTMLify; @@ -41,6 +41,8 @@ sub convert { my ($curproc, $args, $optargs) = @_; my $config = $curproc->config(); + my $ml_name = $config->{ ml_name }; + my $udb_dir = $config->{ udb_base_dir }; my $src_dir = $optargs->{ src_dir }; my $dst_dir = $optargs->{ dst_dir }; my $charset = $curproc->language_of_html_file(); @@ -58,11 +60,17 @@ sub convert print STDERR " convert\n\t$src_dir =>\n\t$dst_dir\n" if $debug; + unless (-d $udb_dir) { $curproc->mkdir($udb_dir);} + my $index_order = $config->{ html_archive_index_order_type }; my $htmlifier_args = { - directory => $dst_dir, charset => $charset, - index_order => $index_order, + + output_dir => $dst_dir, # ~fml/public_html/mlarchive/$domain/$ml/ + db_base_dir => $udb_dir, # /var/spool/ml/@udb@ + db_name => $ml_name, # elena + + index_order => $index_order, # normal/reverse }; my ($is_subdir_exists, $subdirs) = _check_subdir_exists($src_dir); diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index e41ff67f..8eec4cec 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.114 2003/05/13 03:49:55 fukachan Exp $ +# $FML: Distribute.pm,v 1.115 2003/05/13 04:26:48 fukachan Exp $ # package FML::Process::Distribute; @@ -562,17 +562,24 @@ sub htmlify my $ml_name = $config->{ ml_name }; my $spool_dir = $config->{ spool_dir }; my $html_dir = $config->{ html_archive_dir }; + my $udb_dir = $config->{ udb_base_dir }; my $article = $curproc->_build_article_object($args); my $article_id = $pcb->get('article', 'id'); my $article_file = $article->filepath($article_id); my $index_order = $config->{ html_archive_index_order_type }; my $cur_lang = $curproc->language_of_html_file(); + unless (-d $udb_dir) { $curproc->mkdir($udb_dir);} + # XXX-TODO: care for non Japanese. my $htmlifier_args = { - directory => $html_dir, charset => $cur_lang, - index_order => $index_order, + + output_dir => $html_dir, # ~fml/public_html/mlarchive/$domain/$ml/ + db_base_dir => $udb_dir, # /var/spool/ml/@udb@ + db_name => $ml_name, # elena + + index_order => $index_order, # normal/reverse }; $curproc->set_umask_as_public(); |