diff -cNr FAQ-OMatic-2.622/ChangeLog.ja FAQ-OMatic-2.622.ja/ChangeLog.ja *** FAQ-OMatic-2.622/ChangeLog.ja Thu Jan 1 09:00:00 1970 --- FAQ-OMatic-2.622.ja/ChangeLog.ja Mon Apr 19 18:21:55 1999 *************** *** 0 **** --- 1,35 ---- + 1999-04-19 NOKUBI Takatsugu + + * Search.pmでNKFをuseせずにnkfを使おうとしていたのを修正 + + 1999-04-16 NOKUBI Takatsugu + + * 対象バージョンを2.622にする + * Omatic.pm中のsendEmailに日本語変換処理を追加 + + 1999-03-11 NOKUBI Takatsugu + + * submitPart.pm中のファイルアップロード処理を日本語化 + + 1999-03-09 NOKUBI Takatsugu + + * Item.pm中でsubstrを実行している部分を日本語処理に適合するよう変更 + (コードを書いて下さった高野さんありがとうございます) + + 1999-02-17 NOKUBI Takatsugu + + * 日本語化対象バージョンを2.618にする + * ChangeLogをChangeLog.jaに改名 + * MANIFESTにChangeLog.ja, READMEを追加 + + 1999-01-25 Nokubi Takatsugu + + * Item.pm中に漢字変換コードを追加 + + 1999-01-19 Nokubi Takatsugu + + * 日本語化の対象バージョンを2.609にする + * Search.pmに旧バージョンへの差分を当てる + * Words.pmに旧バージョンへの差分を当てる + * Words.pmをText::ChaSen1で動作するように変更 + diff -cNr FAQ-OMatic-2.622/MANIFEST FAQ-OMatic-2.622.ja/MANIFEST *** FAQ-OMatic-2.622/MANIFEST Sat Mar 20 11:41:05 1999 --- FAQ-OMatic-2.622.ja/MANIFEST Fri Apr 16 13:18:38 1999 *************** *** 3,8 **** --- 3,10 ---- Makefile.PL README fom.PL + ChangeLog.ja + README.ja lib/FAQ/OMatic.pm lib/FAQ/OMatic/Appearance.pm lib/FAQ/OMatic/Auth.pm diff -cNr FAQ-OMatic-2.622/README.ja FAQ-OMatic-2.622.ja/README.ja *** FAQ-OMatic-2.622/README.ja Thu Jan 1 09:00:00 1970 --- FAQ-OMatic-2.622.ja/README.ja Mon Apr 19 18:23:12 1999 *************** *** 0 **** --- 1,47 ---- + Faq-O-Matic 2.622 日本語化パッチ + + Copyright (C) 1999 NOKUBI Takatsugu + + 1. 概要 + + このパッチは、Faq-O-Matic 2.622を日本語環境で利用した場合に生じる問題 + を解決するためのものです。 + + 2. 必要なもの + + ・Faq-O-Matic 2.622 + ・perl5 (5.005_02で確認) + ・ChaSen 1.51 + 辞書 + ・Text::ChaSen1 0.11 + ・NKF.pm (nkf1.7に付属の0.01で確認) + + Text::ChaSen1はから取得できま + す。 + + 3. パッチの当て方 + + Faq-O-Maticのソースを展開することによって作成されるディレクトリ + FAQ-OMatic-2.622をカレントディレクトリとし、 + + patch -p1 < FAQ-O-Matic-2.622-ja2.diff + + を実行します。 + + 4. パッチが行うこと + + このパッチによって、次のような拡張がなされます。 + + ・内部の漢字コードをEUCに統一 + ・漢字の第1バイトと第2バイトで分断されないようにする + ・日本語での全文検索を可能にする + + 5. 著作権 + + The Faq-O-Matic is Copyright 1997 by Jon Howell, all rights reserved. + Copyright (C) 1999 NOKUBI Takatsugu + + このソフトウェアは完全に無保証です。 + + また、このソフトウェアはGNU General Public Licenceのもとで再配付、改変 + が認められています。詳細についてはFAQ-O-Maticオリジナルソースに付属の + LICENSEというファイルを参照して下さい。 diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic/Item.pm FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Item.pm *** FAQ-OMatic-2.622/lib/FAQ/OMatic/Item.pm Wed Mar 24 05:14:35 1999 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Item.pm Fri Apr 16 14:48:11 1999 *************** *** 44,49 **** --- 44,51 ---- use FAQ::OMatic::Versions; use FAQ::OMatic::Set; + use NKF; + my %itemCache = (); # contains (filename => item ref) mappings sub new { *************** *** 329,340 **** --- 331,344 ---- } elsif ($key =~ m/-Set$/) { my $a; foreach $a ($self->getSet($key)->getList()) { + $a = nkf('-e', $a); print FILE "$key: $a\n"; } } else { my $value = $self->{$key}; $value =~ s/[\n\r]/ /g; # don't allow CRs in a single-line field, # that would corrupt the file format. + $value = nkf('-e', $value); print FILE "$key: $value\n"; } } *************** *** 897,903 **** # suggestion of adding cat title to reduce confusion is from # THANKS: pauljohn@ukans.edu if (length($title) > 15) { ! $title = substr($title, 0, 12)."..."; } push @$editrow, {'text'=>FAQ::OMatic::button( FAQ::OMatic::makeAref('-command'=>'addItem', --- 901,907 ---- # suggestion of adding cat title to reduce confusion is from # THANKS: pauljohn@ukans.edu if (length($title) > 15) { ! $title = substrJ($title, 12)."..."; } push @$editrow, {'text'=>FAQ::OMatic::button( FAQ::OMatic::makeAref('-command'=>'addItem', *************** *** 1519,1528 **** sub rightEnd { my $string = shift; my $amount = shift; if ($amount >= length($string)) { return $string; } else { ! return substr($string,length($string)-$amount,$amount); } } --- 1523,1544 ---- sub rightEnd { my $string = shift; my $amount = shift; + my ($n, $c, $r, $mb, $width, $result); + $width = length($string) - $amount; if ($amount >= length($string)) { return $string; } else { ! while (length($string)) { ! last unless ($mb = $string =~ s/^([\200-\377].)+//) || ! $string =~s/[\0-\177]+//; ! $n = $width; ! $n -= $width % 2 if $mb; ! ($c,$r) = unpack("a$n a*", $&); ! $width -= length($c); ! $result .= $c; ! last if length($r) ! } ! return ($r.$string); } } *************** *** 1592,1598 **** .rightEnd($ls,40) .' ' .$parts[$i] ! .substr($rs,0,40) .($rtrunc ? '...' : '')); } my $context = join("\n
", @contexts); --- 1608,1614 ---- .rightEnd($ls,40) .' ' .$parts[$i] ! .substrJ($rs,40) .($rtrunc ? '...' : '')); } my $context = join("\n
", @contexts); *************** *** 1761,1765 **** --- 1777,1799 ---- $self->setProperty('SequenceNumber', $self->{'SequenceNumber'}+1); } + + sub substrJ{ + my $string = shift; + my $width = shift; + my $result = shift; + my ($n, $c, $r, $mb); + while (length($string)){ + last unless ($mb = $string =~ s/^([\200-\377].)+//) + || $string =~ s/[\0-\177]+//; + $n = $width; + $n -= $width % 2 if $mb; + ($c,$r) = unpack("a$n a*", $&); + $width -= length($c); + $result .= $c; + last if length($r); + } + return $result; + } # end of sub substrJ.. 1; diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic/Part.pm FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Part.pm *** FAQ-OMatic-2.622/lib/FAQ/OMatic/Part.pm Wed Mar 24 03:11:03 1999 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Part.pm Fri Apr 16 13:18:38 1999 *************** *** 41,46 **** --- 41,48 ---- use FAQ::OMatic::Set; use Text::Tabs; + use NKF; + sub new { my ($class) = shift; *************** *** 577,582 **** --- 579,585 ---- $Text::Tabs::tabstop = 8; $newText = join("\n", Text::Tabs::expand(split(/\n/, $newText))); } + $newText = nkf('-e', $newText); $self->{'Text'} = $newText; } diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic/Search.pm FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Search.pm *** FAQ-OMatic-2.622/lib/FAQ/OMatic/Search.pm Sat Mar 20 11:40:53 1999 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Search.pm Mon Apr 19 18:20:58 1999 *************** *** 38,43 **** --- 38,45 ---- use FAQ::OMatic::Words; use FAQ::OMatic; + use NKF; + my %wordDB; sub openWordDB { *************** *** 152,157 **** --- 154,160 ---- # and store it in another parameter. $pattern = $params->{'_search'}; + $pattern = nkf('-e', $pattern); my @patternwords = FAQ::OMatic::Words::getWords( $pattern ); $params->{'_searchArray'} = \@patternwords; diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic/Words.pm FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Words.pm *** FAQ-OMatic-2.622/lib/FAQ/OMatic/Words.pm Sat Mar 20 11:40:53 1999 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic/Words.pm Fri Apr 16 13:18:38 1999 *************** *** 43,48 **** --- 43,55 ---- package FAQ::OMatic::Words; + use Text::ChaSen1; + use NKF; + + BEGIN { + &Text::ChaSen1::getopt_argv('faq-omatic', '-j', '-F', '%m '); + } + sub cannonical { my $string = shift; *************** *** 80,91 **** # given a user-input string, we break it into "legal" words # and return an array of them $string = cannonical( $string ); my $wordPattern = '[A-Za-z0-9\-]'; # for ISO-8859-1 char set, try #my $wordPattern = '[A-Za-z0-9\-\300-\326\330-\366\370-\377]'; ! my @words = ($string =~ m/($wordPattern+)/gso); @words; } --- 87,102 ---- # given a user-input string, we break it into "legal" words # and return an array of them + $string = nkf('-e', $string); $string = cannonical( $string ); my $wordPattern = '[A-Za-z0-9\-]'; # for ISO-8859-1 char set, try #my $wordPattern = '[A-Za-z0-9\-\300-\326\330-\366\370-\377]'; ! # my @words = ($string =~ m/($wordPattern+)/gso); ! my $s = &Text::ChaSen1::sparse_tostr($string); ! chomp $s; ! my @words = split / /, $s; @words; } diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic.pm FAQ-OMatic-2.622.ja/lib/FAQ/OMatic.pm *** FAQ-OMatic-2.622/lib/FAQ/OMatic.pm Wed Mar 24 06:47:09 1999 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic.pm Fri Apr 16 13:20:17 1999 *************** *** 43,48 **** --- 43,50 ---- use FAQ::OMatic::Intl; use FAQ::OMatic::Bags; + use NKF; + # use vars lets us leave these variables globally-visible (when # fully qualified) without getting a gripe from 'use strict'. use vars qw($VERSION $authorAddress %theParams $userGripes); *************** *** 911,916 **** --- 913,920 ---- my $to = shift; # array ref or scalar my $subj = shift; my $mesg = shift; + + $mesg = nkf('-e', $mesg); # untaint $to address if (ref $to) { diff -cNr FAQ-OMatic-2.622/lib/FAQ/OMatic.pm.rej FAQ-OMatic-2.622.ja/lib/FAQ/OMatic.pm.rej *** FAQ-OMatic-2.622/lib/FAQ/OMatic.pm.rej Thu Jan 1 09:00:00 1970 --- FAQ-OMatic-2.622.ja/lib/FAQ/OMatic.pm.rej Fri Apr 16 13:18:38 1999 *************** *** 0 **** --- 1,17 ---- + *************** + *** 43,48 **** + use FAQ::OMatic::Intl; + use FAQ::OMatic::Bags; + + use vars # these are mod_perl-safe + # effectively constants + qw($VERSION $authorAddress $USE_MOD_PERL), + --- 43,50 ---- + use FAQ::OMatic::Intl; + use FAQ::OMatic::Bags; + + + use NKF; + + + use vars # these are mod_perl-safe + # effectively constants + qw($VERSION $authorAddress $USE_MOD_PERL),