From 2da48f4ab687e3d28898e839e3f289c8837b01d9 Mon Sep 17 00:00:00 2001 From: kgsoft Date: Thu, 14 Feb 2019 20:58:29 +0900 Subject: [PATCH] =?utf8?q?=E6=9C=AA=E5=AE=9A=E7=BE=A9=E5=A4=89=E6=95=B0?= =?utf8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=81=A8=E3=83=89=E3=82=AD=E3=83=A5?= =?utf8?q?=E3=83=A1=E3=83=B3=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tools/readme.wiki | 3 ++- tools/wiki2html.pl | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/readme.wiki b/tools/readme.wiki index c4f06ab..8f19eed 100644 --- a/tools/readme.wiki +++ b/tools/readme.wiki @@ -9,10 +9,11 @@ ¤Þ¤¿¡¢tools¤òÇÛÃÖ¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Ä¶­ÊÑ¿ôPATH¤òÄ̤·¤Æ¤ª¤¯¤ÈÊØÍø¤Ç¤¹¡£ !!wiki2html - wiki2html.pl ¥½¡¼¥¹¥Õ¥¡¥¤¥ë [-title=¥¿¥¤¥È¥ë] [-css=¥¹¥¿¥¤¥ë¥·¡¼¥È] [-output=sjis|euc] + wiki2html.pl ¥½¡¼¥¹¥Õ¥¡¥¤¥ë [-title=¥¿¥¤¥È¥ë] [-css=¥¹¥¿¥¤¥ë¥·¡¼¥È] [-output=sjis|euc] [-farm=¥Õ¥¡¡¼¥à̾] :-title:HTML¥É¥­¥å¥á¥ó¥È¤Î¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ :-css:¥¹¥¿¥¤¥ë¥·¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ :-output:½ÐÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òsjis¤Þ¤¿¤Ïeuc¤Ç»ØÄꤷ¤Þ¤¹¡£ +:-farm:½ÐÎÏÂоݤ¬¥Õ¥¡¡¼¥à¤Î¾ì¹ç¤Ï¥Õ¥¡¡¼¥à̾¤ò»ØÄꤷ¤Þ¤¹¡£ ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ïɬ¿Ü¤Ç¤¹¡£URL¤ò»ØÄꤹ¤ë¤È»ØÄꤷ¤¿URL¤«¤é¥½¡¼¥¹¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïɸ½à½ÐÎϤËHTML¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï°Ê²¼¤Î¤è¤¦¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Æ¤¯¤À¤µ¤¤¡£ diff --git a/tools/wiki2html.pl b/tools/wiki2html.pl index f235059..4040eab 100644 --- a/tools/wiki2html.pl +++ b/tools/wiki2html.pl @@ -14,7 +14,7 @@ use Cwd; # °ú¿ô¤¬Â­¤ê¤Ê¤¤ #=========================================================== if($#ARGV==-1){ - die "wiki2html.pl filename [-title=title] [-output=sjis|euc]\n"; + die "wiki2html.pl filename [-title=title] [-css=stylesheet] [-output=sjis|euc] [-farm=farmname]\n"; } #=========================================================== @@ -23,7 +23,9 @@ if($#ARGV==-1){ my $from = ""; my $title = ""; my $css = ""; +my $input = ""; my $output = "euc"; +my $farm = ""; my $count = 0; my $current = cwd(); chdir($ENV{'FSWIKI_HOME'}); @@ -65,7 +67,7 @@ my $url = $from; $url =~ s/\?.*$//; my $wiki = Wiki::Wiki2HTML->new('setup.dat', CGI->new($url)); -if($farm){ +if($farm ne ""){ $farm =~ s|\/$||; $farm=~/^\// or $farm = "/$farm"; $wiki->config('data_dir' , $wiki->config('data_dir' ).$farm); -- 2.11.0