未定義変数の追加とドキュメント修正

diff --git a/tools/readme.wiki b/tools/readme.wiki
index c4f06ab..8f19eed 100644 (file)
--- a/tools/readme.wiki
+++ b/tools/readme.wiki
@@ -9,10 +9,11 @@
 ¤Þ¤¿¡¢tools¤òÇÛÃÖ¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Ä¶­ÊÑ¿ôPATH¤òÄ̤·¤Æ¤ª¤¯¤ÈÊØÍø¤Ç¤¹¡£
 
 !!wiki2html
 ¤Þ¤¿¡¢tools¤òÇÛÃÖ¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Ä¶­ÊÑ¿ôPATH¤òÄ̤·¤Æ¤ª¤¯¤ÈÊØÍø¤Ç¤¹¡£
 
 !!wiki2html

- wiki2html.pl ¥½¡¼¥¹¥Õ¥¡¥¤¥ë [-title=¥¿¥¤¥È¥ë] [-css=¥¹¥¿¥¤¥ë¥·¡¼¥È] [-output=sjis|euc]
+ wiki2html.pl ¥½¡¼¥¹¥Õ¥¡¥¤¥ë [-title=¥¿¥¤¥È¥ë] [-css=¥¹¥¿¥¤¥ë¥·¡¼¥È] [-output=sjis|euc] [-farm=¥Õ¥¡¡¼¥à̾]

 :-title:HTML¥É¥­¥å¥á¥ó¥È¤Î¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
 :-css:¥¹¥¿¥¤¥ë¥·¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£
 :-output:½ÐÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òsjis¤Þ¤¿¤Ïeuc¤Ç»ØÄꤷ¤Þ¤¹¡£
 :-title:HTML¥É¥­¥å¥á¥ó¥È¤Î¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
 :-css:¥¹¥¿¥¤¥ë¥·¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£
 :-output:½ÐÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òsjis¤Þ¤¿¤Ïeuc¤Ç»ØÄꤷ¤Þ¤¹¡£

+:-farm:½ÐÎÏÂоݤ¬¥Õ¥¡¡¼¥à¤Î¾ì¹ç¤Ï¥Õ¥¡¡¼¥à̾¤ò»ØÄꤷ¤Þ¤¹¡£

 
 ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ïɬ¿Ü¤Ç¤¹¡£URL¤ò»ØÄꤹ¤ë¤È»ØÄꤷ¤¿URL¤«¤é¥½¡¼¥¹¤ò¼èÆÀ¤·¤Þ¤¹¡£
 ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïɸ½à½ÐÎϤËHTML¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï°Ê²¼¤Î¤è¤¦¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 
 ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ïɬ¿Ü¤Ç¤¹¡£URL¤ò»ØÄꤹ¤ë¤È»ØÄꤷ¤¿URL¤«¤é¥½¡¼¥¹¤ò¼èÆÀ¤·¤Þ¤¹¡£
 ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïɸ½à½ÐÎϤËHTML¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï°Ê²¼¤Î¤è¤¦¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Æ¤¯¤À¤µ¤¤¡£

diff --git a/tools/wiki2html.pl b/tools/wiki2html.pl
index f235059..4040eab 100644 (file)
--- a/tools/wiki2html.pl
+++ b/tools/wiki2html.pl
@@ -14,7 +14,7 @@ use Cwd;
 # °ú¿ô¤¬Â­¤ê¤Ê¤¤
 #===========================================================
 if($#ARGV==-1){
 # °ú¿ô¤¬Â­¤ê¤Ê¤¤
 #===========================================================
 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 $from    = "";
 my $title   = "";
 my $css     = "";

+my $input   = "";

 my $output  = "euc";
 my $output  = "euc";

+my $farm    = "";

 my $count   = 0;
 my $current = cwd();
 chdir($ENV{'FSWIKI_HOME'});
 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));
 
 $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);
        $farm =~ s|\/$||;
        $farm=~/^\// or $farm = "/$farm";
        $wiki->config('data_dir'   , $wiki->config('data_dir'  ).$farm);