Index: filter/bzip2.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/bzip2.pl,v
retrieving revision 1.16
diff -u -r1.16 bzip2.pl
--- filter/bzip2.pl	2000/03/23 10:41:04	1.16
+++ filter/bzip2.pl	2001/10/15 06:30:14
@@ -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: filter/compress.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/compress.pl,v
retrieving revision 1.15
diff -u -r1.15 compress.pl
--- filter/compress.pl	2000/03/23 10:41:04	1.15
+++ filter/compress.pl	2001/10/15 06:30:14
@@ -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: filter/deb.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/deb.pl,v
retrieving revision 1.5
diff -u -r1.5 deb.pl
--- filter/deb.pl	2001/06/24 09:36:35	1.5
+++ filter/deb.pl	2001/10/15 06:30:15
@@ -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: filter/dvi.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/dvi.pl,v
retrieving revision 1.2
diff -u -r1.2 dvi.pl
--- filter/dvi.pl	2001/01/04 01:57:58	1.2
+++ filter/dvi.pl	2001/10/15 06:30:16
@@ -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: filter/excel.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/excel.pl,v
retrieving revision 1.13
diff -u -r1.13 excel.pl
--- filter/excel.pl	2000/12/15 05:37:41	1.13
+++ filter/excel.pl	2001/10/15 06:30:18
@@ -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: filter/gzip.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/gzip.pl,v
retrieving revision 1.16
diff -u -r1.16 gzip.pl
--- filter/gzip.pl	2000/03/23 10:41:04	1.16
+++ filter/gzip.pl	2001/10/15 06:30:19
@@ -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: filter/hdml.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/hdml.pl,v
retrieving revision 1.6
diff -u -r1.6 hdml.pl
--- filter/hdml.pl	2001/02/07 10:23:10	1.6
+++ filter/hdml.pl	2001/10/15 06:30:21
@@ -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: filter/hnf.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/hnf.pl,v
retrieving revision 1.9
diff -u -r1.9 hnf.pl
--- filter/hnf.pl	2001/01/14 13:38:35	1.9
+++ filter/hnf.pl	2001/10/15 06:30:28
@@ -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: filter/html.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/html.pl,v
retrieving revision 1.32
diff -u -r1.32 html.pl
--- filter/html.pl	2001/01/13 09:16:04	1.32
+++ filter/html.pl	2001/10/15 06:30:31
@@ -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: filter/mailnews.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/mailnews.pl,v
retrieving revision 1.27
diff -u -r1.27 mailnews.pl
--- filter/mailnews.pl	2001/04/23 09:09:38	1.27
+++ filter/mailnews.pl	2001/10/15 06:30:33
@@ -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: filter/man.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/man.pl,v
retrieving revision 1.26
diff -u -r1.26 man.pl
--- filter/man.pl	2000/03/15 11:52:03	1.26
+++ filter/man.pl	2001/10/15 06:30:34
@@ -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: filter/mhonarc.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/mhonarc.pl,v
retrieving revision 1.24
diff -u -r1.24 mhonarc.pl
--- filter/mhonarc.pl	2001/09/15 00:45:30	1.24
+++ filter/mhonarc.pl	2001/10/15 06:30:35
@@ -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: filter/msword.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/msword.pl,v
retrieving revision 1.29
diff -u -r1.29 msword.pl
--- filter/msword.pl	2001/08/08 09:05:46	1.29
+++ filter/msword.pl	2001/10/15 06:30:36
@@ -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: filter/pdf.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/pdf.pl,v
retrieving revision 1.22
diff -u -r1.22 pdf.pl
--- filter/pdf.pl	2001/01/04 01:57:58	1.22
+++ filter/pdf.pl	2001/10/15 06:30:37
@@ -56,8 +56,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: filter/postscript.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/postscript.pl,v
retrieving revision 1.5
diff -u -r1.5 postscript.pl
--- filter/postscript.pl	2001/08/20 13:31:56	1.5
+++ filter/postscript.pl	2001/10/15 06:30:38
@@ -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: filter/powerpoint.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/powerpoint.pl,v
retrieving revision 1.6
diff -u -r1.6 powerpoint.pl
--- filter/powerpoint.pl	2000/12/26 04:59:01	1.6
+++ filter/powerpoint.pl	2001/10/15 06:30:39
@@ -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: filter/rfc.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/rfc.pl,v
retrieving revision 1.17
diff -u -r1.17 rfc.pl
--- filter/rfc.pl	2000/02/11 16:46:31	1.17
+++ filter/rfc.pl	2001/10/15 06:30:40
@@ -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: filter/rpm.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/rpm.pl,v
retrieving revision 1.4
diff -u -r1.4 rpm.pl
--- filter/rpm.pl	2001/06/24 09:36:35	1.4
+++ filter/rpm.pl	2001/10/15 06:30: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 $cfile = defined $orig_cfile ? $$orig_cfile : '';
 
Index: filter/taro.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/taro.pl,v
retrieving revision 1.7
diff -u -r1.7 taro.pl
--- filter/taro.pl	2001/06/19 09:08:15	1.7
+++ filter/taro.pl	2001/10/15 06:30:41
@@ -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: filter/tex.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/tex.pl,v
retrieving revision 1.7
diff -u -r1.7 tex.pl
--- filter/tex.pl	2000/03/15 06:53:50	1.7
+++ filter/tex.pl	2001/10/15 06:30:41
@@ -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: filter/win32/ichitaro456.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/ichitaro456.pl,v
retrieving revision 1.6
diff -u -r1.6 ichitaro456.pl
--- filter/win32/ichitaro456.pl	2001/01/12 05:15:31	1.6
+++ filter/win32/ichitaro456.pl	2001/10/15 06:30:42
@@ -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: filter/win32/oleexcel.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/oleexcel.pl,v
retrieving revision 1.11
diff -u -r1.11 oleexcel.pl
--- filter/win32/oleexcel.pl	2001/01/27 02:51:29	1.11
+++ filter/win32/oleexcel.pl	2001/10/15 06:30:44
@@ -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: filter/win32/olemsword.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/olemsword.pl,v
retrieving revision 1.8
diff -u -r1.8 olemsword.pl
--- filter/win32/olemsword.pl	2001/01/26 11:17:31	1.8
+++ filter/win32/olemsword.pl	2001/10/15 06:30:45
@@ -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: filter/win32/olepowerpoint.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/olepowerpoint.pl,v
retrieving revision 1.8
diff -u -r1.8 olepowerpoint.pl
--- filter/win32/olepowerpoint.pl	2001/01/25 21:20:52	1.8
+++ filter/win32/olepowerpoint.pl	2001/10/15 06:30:46
@@ -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: filter/win32/olertf.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/olertf.pl,v
retrieving revision 1.4
diff -u -r1.4 olertf.pl
--- filter/win32/olertf.pl	2001/01/19 10:42:16	1.4
+++ filter/win32/olertf.pl	2001/10/15 06:30:46
@@ -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: filter/win32/oletaro.pl
===================================================================
RCS file: /storage/cvsroot/namazu/filter/win32/oletaro.pl,v
retrieving revision 1.2
diff -u -r1.2 oletaro.pl
--- filter/win32/oletaro.pl	2001/01/19 10:42:16	1.2
+++ filter/win32/oletaro.pl	2001/10/15 06:30:47
@@ -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: scripts/mknmz.in
===================================================================
RCS file: /storage/cvsroot/namazu/scripts/mknmz.in,v
retrieving revision 1.98
diff -u -r1.98 mknmz.in
--- scripts/mknmz.in	2001/09/21 08:12:03	1.98
+++ scripts/mknmz.in	2001/10/15 06:31:01
@@ -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");
 	    }
