Namazu-devel-ja(旧)

[Yukio USUDA <m6694ha392t@xxxxxxxxxxxxxxx>]

臼田です

STABLEにmultipart処理対応にしたmailnews.plを入れた後で
気づいたのですが

寺西さんがHEADに入れた修正が関係あったような気がします。
http://cvs.namazu.org/namazu/scripts/mknmz.in.diff?r1=1.127&r2=1.128

STABLEにも下記のような修正をしておけばよいですよね。

Index: scripts/mknmz.in
===================================================================
RCS file: /storage/cvsroot/namazu/scripts/mknmz.in,v
retrieving revision 1.85.4.51
diff -u -r1.85.4.51 mknmz.in
--- scripts/mknmz.in    24 Apr 2004 03:33:25 -0000      1.85.4.51
+++ scripts/mknmz.in    26 Apr 2004 12:01:20 -0000
@@ -831,6 +831,9 @@
                  '::filter($orig_cfile, $contref, $weighted_str, $headings, $fields);';
            }
            if ($err) {
+               if ($err =~ m/; x-system=unsupported$/) {
+                   return (0, $err);
+               }
                return (0, "$mtype; x-error=$err");
            }
 
@@ -1513,7 +1516,15 @@
     my ($cfile, $cfile_size, $text_size, $mtype, $uri) = @_;
 
     my $msg = undef;
-    if (! -e $cfile) {
+    if ($mtype =~ /; x-system=unsupported$/) {
+       $mtype =~ s/; x-system=unsupported$//;
+       $msg = _("Unsupported media type ")."($mtype)"._(" skipped.");
+    } elsif ($mtype =~ /; x-error=.*$/) {
+       $mtype =~ s/^.*; x-error=(.*)$/$1/;
+       $msg = $mtype;
+    } elsif ($mtype =~ /^x-system/) {
+       $msg = _("system error occurred! ")."($mtype)"._(" skipped.");
+    } elsif (! -e $cfile) {
        $msg = _("does NOT EXIST! skipped.");
     } elsif (! -r $cfile) {
        $msg = _("is NOT READABLE! skipped.");
@@ -1525,14 +1536,6 @@
        $msg = _("is larger than your setup before filtered, skipped: ") . 'conf::FILE_SIZE_MAX (' . $conf::FILE_SIZE_MAX . ') < '. $cfile_size ;
     } elsif ($text_size > $conf::TEXT_SIZE_MAX) {
        $msg = _("is larger than your setup after filtered, skipped: ") . 'conf::TEXT_SIZE_MAX (' . $conf::TEXT_SIZE_MAX . ') < '. $text_size ;
-    } elsif ($mtype =~ /; x-system=unsupported$/) {
-       $mtype =~ s/; x-system=unsupported$//;
-       $msg = _("Unsupported media type ")."($mtype)"._(" skipped.");
-    } elsif ($mtype =~ /; x-error=.*$/) {
-       $mtype =~ s/^.*; x-error=(.*)$/$1/;
-       $msg = $mtype;
-    } elsif ($mtype =~ /^x-system/) {
-       $msg = _("system error occurred! ")."($mtype)".(" skipped.");
     } 
 
     return $msg;

臼田幸生