Index: namazu/filter/bzip2.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/bzip2.pl,v retrieving revision 1.16 diff -u -r1.16 bzip2.pl --- namazu/filter/bzip2.pl 2000/03/23 10:41:04 1.16 +++ namazu/filter/bzip2.pl 2001/10/15 05:28:36 @@ -54,8 +54,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $tmpfile = util::tmpnam('NMZ.bzip2'); Index: namazu/filter/compress.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/compress.pl,v retrieving revision 1.15 diff -u -r1.15 compress.pl --- namazu/filter/compress.pl 2000/03/23 10:41:04 1.15 +++ namazu/filter/compress.pl 2001/10/15 05:28:36 @@ -54,8 +54,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $tmpfile = util::tmpnam('NMZ.compr'); Index: namazu/filter/deb.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/deb.pl,v retrieving revision 1.5 diff -u -r1.5 deb.pl --- namazu/filter/deb.pl 2001/06/24 09:36:35 1.5 +++ namazu/filter/deb.pl 2001/10/15 05:28:36 @@ -58,8 +58,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/dvi.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/dvi.pl,v retrieving revision 1.2 diff -u -r1.2 dvi.pl --- namazu/filter/dvi.pl 2001/01/04 01:57:58 1.2 +++ namazu/filter/dvi.pl 2001/10/15 05:28:37 @@ -58,8 +58,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/excel.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/excel.pl,v retrieving revision 1.13 diff -u -r1.13 excel.pl --- namazu/filter/excel.pl 2000/12/15 05:37:41 1.13 +++ namazu/filter/excel.pl 2001/10/15 05:28:37 @@ -78,8 +78,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $err = undef; Index: namazu/filter/gzip.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/gzip.pl,v retrieving revision 1.16 diff -u -r1.16 gzip.pl --- namazu/filter/gzip.pl 2000/03/23 10:41:04 1.16 +++ namazu/filter/gzip.pl 2001/10/15 05:28:37 @@ -55,8 +55,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $err = undef; Index: namazu/filter/hdml.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/hdml.pl,v retrieving revision 1.6 diff -u -r1.6 hdml.pl --- namazu/filter/hdml.pl 2001/02/07 10:23:10 1.6 +++ namazu/filter/hdml.pl 2001/10/15 05:28:38 @@ -53,8 +53,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/hnf.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/hnf.pl,v retrieving revision 1.9 diff -u -r1.9 hnf.pl --- namazu/filter/hnf.pl 2001/01/14 13:38:35 1.9 +++ namazu/filter/hnf.pl 2001/10/15 05:28:39 @@ -60,8 +60,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $contref, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $contref, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/html.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/html.pl,v retrieving revision 1.32 diff -u -r1.32 html.pl --- namazu/filter/html.pl 2001/01/13 09:16:04 1.32 +++ namazu/filter/html.pl 2001/10/15 05:28:39 @@ -51,8 +51,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/mailnews.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/mailnews.pl,v retrieving revision 1.27 diff -u -r1.27 mailnews.pl --- namazu/filter/mailnews.pl 2001/04/23 09:09:38 1.27 +++ namazu/filter/mailnews.pl 2001/10/15 05:28:40 @@ -52,8 +52,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/man.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/man.pl,v retrieving revision 1.26 diff -u -r1.26 man.pl --- namazu/filter/man.pl 2000/03/15 11:52:03 1.26 +++ namazu/filter/man.pl 2001/10/15 05:28:40 @@ -86,8 +86,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/mhonarc.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/mhonarc.pl,v retrieving revision 1.24 diff -u -r1.24 mhonarc.pl --- namazu/filter/mhonarc.pl 2001/09/15 00:45:30 1.24 +++ namazu/filter/mhonarc.pl 2001/10/15 05:28:40 @@ -63,8 +63,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $contref, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $contref, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/msword.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/msword.pl,v retrieving revision 1.29 diff -u -r1.29 msword.pl --- namazu/filter/msword.pl 2001/08/08 09:05:46 1.29 +++ namazu/filter/msword.pl 2001/10/15 05:28:41 @@ -75,8 +75,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $err = undef; Index: namazu/filter/oasys.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/oasys.pl,v retrieving revision 1.5 diff -u -r1.5 oasys.pl --- namazu/filter/oasys.pl 2001/04/13 05:53:41 1.5 +++ namazu/filter/oasys.pl 2001/10/15 05:28:41 @@ -60,8 +60,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/postscript.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/postscript.pl,v retrieving revision 1.5 diff -u -r1.5 postscript.pl --- namazu/filter/postscript.pl 2001/08/20 13:31:56 1.5 +++ namazu/filter/postscript.pl 2001/10/15 05:28:41 @@ -58,8 +58,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $tmpfile = util::tmpnam('NMZ.postscript'); Index: namazu/filter/powerpoint.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/powerpoint.pl,v retrieving revision 1.6 diff -u -r1.6 powerpoint.pl --- namazu/filter/powerpoint.pl 2000/12/26 04:59:01 1.6 +++ namazu/filter/powerpoint.pl 2001/10/15 05:28:41 @@ -77,8 +77,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $err = undef; Index: namazu/filter/rfc.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/rfc.pl,v retrieving revision 1.17 diff -u -r1.17 rfc.pl --- namazu/filter/rfc.pl 2000/02/11 16:46:31 1.17 +++ namazu/filter/rfc.pl 2001/10/15 05:28:42 @@ -64,8 +64,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/rpm.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/rpm.pl,v retrieving revision 1.4 diff -u -r1.4 rpm.pl --- namazu/filter/rpm.pl 2001/06/24 09:36:35 1.4 +++ namazu/filter/rpm.pl 2001/10/15 05:28:42 @@ -58,8 +58,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/taro.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/taro.pl,v retrieving revision 1.7 diff -u -r1.7 taro.pl --- namazu/filter/taro.pl 2001/06/19 09:08:15 1.7 +++ namazu/filter/taro.pl 2001/10/15 05:28:42 @@ -67,8 +67,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/tex.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/tex.pl,v retrieving revision 1.7 diff -u -r1.7 tex.pl --- namazu/filter/tex.pl 2000/03/15 06:53:50 1.7 +++ namazu/filter/tex.pl 2001/10/15 05:28:42 @@ -62,8 +62,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/wordpro.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/wordpro.pl,v retrieving revision 1.6 diff -u -r1.6 wordpro.pl --- namazu/filter/wordpro.pl 2001/06/19 09:08:15 1.6 +++ namazu/filter/wordpro.pl 2001/10/15 05:28:43 @@ -60,8 +60,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/win32/ichitaro456.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/ichitaro456.pl,v retrieving revision 1.6 diff -u -r1.6 ichitaro456.pl --- namazu/filter/win32/ichitaro456.pl 2001/01/12 05:15:31 1.6 +++ namazu/filter/win32/ichitaro456.pl 2001/10/15 05:28:43 @@ -75,8 +75,8 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; Index: namazu/filter/win32/oleexcel.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/oleexcel.pl,v retrieving revision 1.11 diff -u -r1.11 oleexcel.pl --- namazu/filter/win32/oleexcel.pl 2001/01/27 02:51:29 1.11 +++ namazu/filter/win32/oleexcel.pl 2001/10/15 05:28:43 @@ -125,8 +125,9 @@ return undef; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) = @_; +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) + = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; my $fileName = $cfile; Index: namazu/filter/win32/olemsword.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/olemsword.pl,v retrieving revision 1.8 diff -u -r1.8 olemsword.pl --- namazu/filter/win32/olemsword.pl 2001/01/26 11:17:31 1.8 +++ namazu/filter/win32/olemsword.pl 2001/10/15 05:28:44 @@ -85,8 +85,9 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) = @_; +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) + = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; util::vprint("Processing ms-word file ... (using 'Win32::OLE->new Word.Application')\n"); Index: namazu/filter/win32/olepowerpoint.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/olepowerpoint.pl,v retrieving revision 1.8 diff -u -r1.8 olepowerpoint.pl --- namazu/filter/win32/olepowerpoint.pl 2001/01/25 21:20:52 1.8 +++ namazu/filter/win32/olepowerpoint.pl 2001/10/15 05:28:44 @@ -85,8 +85,9 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) = @_; +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) + = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; util::vprint("Processing powerpoint file ... (using 'Win32::OLE->new PowerPoint.Application')\n"); Index: namazu/filter/win32/olertf.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/olertf.pl,v retrieving revision 1.4 diff -u -r1.4 olertf.pl --- namazu/filter/win32/olertf.pl 2001/01/19 10:42:16 1.4 +++ namazu/filter/win32/olertf.pl 2001/10/15 05:28:45 @@ -65,8 +65,9 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) = @_; +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) + = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; util::vprint("Processing rtf file ...\n"); Index: namazu/filter/win32/oletaro.pl =================================================================== RCS file: /storage/cvsroot/namazu/filter/win32/oletaro.pl,v retrieving revision 1.2 diff -u -r1.2 oletaro.pl --- namazu/filter/win32/oletaro.pl 2001/01/19 10:42:16 1.2 +++ namazu/filter/win32/oletaro.pl 2001/10/15 05:28:45 @@ -70,8 +70,9 @@ return; } -sub filter ($$$$$) { - my ($orig_cfile, $cont, $weighted_str, $headings, $fields) = @_; +sub filter ($$$$$$$) { + my ($orig_cfile, $cont, $weighted_str, $headings, $fields, $mother_cfile, $fragment) + = @_; my $cfile = defined $orig_cfile ? $$orig_cfile : ''; util::vprint("Processing ichitaro file ...\n"); Index: namazu/scripts/mknmz.in =================================================================== RCS file: /storage/cvsroot/namazu/scripts/mknmz.in,v retrieving revision 1.98 diff -u -r1.98 mknmz.in --- namazu/scripts/mknmz.in 2001/09/21 08:12:03 1.98 +++ namazu/scripts/mknmz.in 2001/10/15 05:28:50 @@ -178,6 +178,7 @@ my $processed_num = 0; my $file_size = util::filesize($cfile); + my $mother_cfile = $cfile; if ($var::Opt{'htmlsplit'} && $cfile =~ $conf::HTML_SUFFIX) { my @parts = htmlsplit::split($cfile, "NMZ.partial"); @@ -192,7 +193,7 @@ $docid_base, $file_count, $field_indices, $fh_errorsfile, $total_files_num, - $uri, $id, $#parts); + $uri, $id, $#parts, $mother_cfile, $fragment); if ($result > 0) { $processed_num++; my $rname = defined $part ? "$cfile\t$part" : "$cfile"; @@ -207,7 +208,7 @@ my $result = namazu_core($cfile, $docid_count, $docid_base, $file_count, $field_indices, $fh_errorsfile, $total_files_num, - undef, undef, undef); + undef, undef, undef, undef, undef); if ($result > 0) { $processed_num++; put_registry($cfile); @@ -451,10 +452,10 @@ # # FIXME: Too many parameters. They must be cleared. # -sub namazu_core ($$$$$$$$$$) { +sub namazu_core ($$$$$$$$$$$$) { my ($cfile, $docid_count, $docid_base, $file_count, $field_indices, $fh_errorsfile, $total_files_num, - $uri, $part_id, $part_num) = @_; + $uri, $part_id, $part_num, $mother_cfile, $fragment) = @_; my $headings = ""; my $content = ""; @@ -473,7 +474,7 @@ } my ($cfile_size, $text_size, $kanji, $mtype) = load_document(\$cfile, \$content, \$weighted_str, - \$headings, \%fields); + \$headings, \%fields, $mother_cfile, $fragment); util::dprint(_("after load_document: ")."$uri: $cfile_size, $text_size, $kanji, $mtype\n"); @@ -733,8 +734,8 @@ # load a document file -sub load_document ($$$$\%) { - my ($orig_cfile, $contref, $weighted_str, $headings, $fields) +sub load_document ($$$$\%$$) { + my ($orig_cfile, $contref, $weighted_str, $headings, $fields, $mother_cfile, $fragment) = @_; my $cfile = $$orig_cfile; @@ -812,7 +813,7 @@ "\"$var::REQUIRE_ACTIONS{$mtype}.pl\"\n"; my $err = undef; eval '$err = ' . $var::REQUIRE_ACTIONS{$mtype} . - '::filter($orig_cfile, $contref, $weighted_str, $headings, $fields);'; + '::filter($orig_cfile, $contref, $weighted_str, $headings, $fields, $mother_cfile, $fragment);'; if ($err) { return ($file_size, $file_size, 0, "$mtype; x-error=$err"); }