namazu-ml(avocado)

[Ken-ichi Hirose <hirose@xxxxxxxxxxxxxxxxxxxx>]

広瀬と申します。

ということで。。。

オーバーヘッドがどれくらい大きくなるか試してないのですが、以下の patch で
引っかかることは無くなると思います。

 <hirose@xxxxxxxxxxxxxxxxxxxx> wrote.
/~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>mknmz.pl を少しいじりました diff は後程送ります。

---8<------8<------8<------8<------8<------8<------8<------8<------8<------8<--
diff -rc Makefile ../namazu-111-proto-3/Makefile
*** ../namazu-111-proto-3/Makefile	Tue Feb 03 07:50:23 1998
--- Makefile	Wed Feb 04 10:41:25 1998
***************
*** 6,12 ****
  ## System
  ## select your system (UNIX or WIN32).
  
! SYSTEM		= UNIX
  
  ##################################################################
  ## Directories
--- 6,12 ----
  ## System
  ## select your system (UNIX or WIN32).
  
! SYSTEM		= WIN32
  
  ##################################################################
  ## Directories
***************
*** 32,40 ****
  ## path by using \\\\ string for path separator.
  
  OPT_PATH_PERL		= /usr/bin/perl
! OPT_PATH_NKF		= /usr/local/bin/nkf
! OPT_PATH_KAKASI		= /usr/local/bin/kakasi
! OPT_PATH_CHASEN		= /usr/local/bin/chasen
  
  ##################################################################
  ## Administrator's email address
--- 32,46 ----
  ## path by using \\\\ string for path separator.
  
  OPT_PATH_PERL		= /usr/bin/perl
! OPT_PATH_NKF		= \\\\usr\\\\local\\\\bin\\\\nkf
! OPT_PATH_KAKASI		= \\\\usr\\\\local\\\\bin\\\\kakasi
! OPT_PATH_CHASEN		= \\\\usr\\\\local\\\\bin\\\\chasen
! 
! ##################################################################
! ## Pathname of Helper Programs
! ##  * OPT_HELPER_ZCAT  :  program that expand compressed file
! 
! OPT_HELPER_ZCAT		= \\\\usr\\\\local\\\\bin\\\\zcat
  
  ##################################################################
  ## Administrator's email address
***************
*** 48,59 ****
  OPT_URL_CGIBIN	= /cgi-bin
  
  ##################################################################
- ## Pathname of Helper Programs
- ##  * OPT_HELPER_ZCAT  :  program that expand compressed file
- 
- OPT_HELPER_ZCAT		= /bin/zcat
- 
- ##################################################################
  ## Target for Make
  ##   * mknmz       :  Indexer
  ##   * wdnmz       :  Program that print registered words
--- 54,59 ----
***************
*** 63,69 ****
  ##   * namazu      :  UNIX    executable  (copy of namazu.cgi)
  ##   * namazu.exe  :  Win32   executable  (copy of namazu.cgi)
  
! TARGET		= mknmz wdnmz documents namazu.cgi namazu
  
  ##################################################################
  ## Target file regular expression for indexing (case insensitive)
--- 63,69 ----
  ##   * namazu      :  UNIX    executable  (copy of namazu.cgi)
  ##   * namazu.exe  :  Win32   executable  (copy of namazu.cgi)
  
! TARGET		= mknmz wdnmz documents namazu.cgi namazu namazu.exe
  
  ##################################################################
  ## Target file regular expression for indexing (case insensitive)
***************
*** 150,155 ****
--- 150,156 ----
  DEPEND		= makedepend
  RANLIB		= ranlib
  RM		= rm -f
+ SOS		= mksos -f p
  ARCDIR		= ../ARC
  
  
***************
*** 206,212 ****
  		lynxcgi.html > lynxcgi.html.tmp
  	mv lynxcgi.html.tmp lynxcgi.html
  
! install:
  	if [ ! -d $(CGIDIR) ]; then \
  	    mkdir -p $(CGIDIR); \
  	fi
--- 207,213 ----
  		lynxcgi.html > lynxcgi.html.tmp
  	mv lynxcgi.html.tmp lynxcgi.html
  
! install: all
  	if [ ! -d $(CGIDIR) ]; then \
  	    mkdir -p $(CGIDIR); \
  	fi
diff -rc mknmz.pl ../namazu-111-proto-3/mknmz.pl
*** ../namazu-111-proto-3/mknmz.pl	Tue Feb 03 07:50:23 1998
--- mknmz.pl	Wed Feb 04 11:12:41 1998
***************
*** 828,834 ****
      $PROTOCOL = cwd() . "/" if $PROTOCOL eq "\t";
  
      $file_segment = &findfiles;
!     open(FLIST, "|$NKF -jZ >$FLIST_") || die "Can't open $FLIST_.\n";
      binmode(FLIST);
      open(ERRORSFILE, ">>$ERRORSFILE") || die "Can't open $ERRORSFILE.\n";
      binmode(ERRORSFILE);
--- 828,834 ----
      $PROTOCOL = cwd() . "/" if $PROTOCOL eq "\t";
  
      $file_segment = &findfiles;
!     open(FLIST, ">$FLIST_") || die "Can't open $FLIST_.\n";
      binmode(FLIST);
      open(ERRORSFILE, ">>$ERRORSFILE") || die "Can't open $ERRORSFILE.\n";
      binmode(ERRORSFILE);
***************
*** 842,847 ****
--- 842,854 ----
  
      close(FLIST);
      close(ERRORSFILE);
+     open(FLIST, "$NKF -jZ $FLIST_|") || die "Can't open $FLIST_.\n";
+     open(FLISTTMP, ">$TMP_I") || die "Can't open $TMP_I.\n";
+     binmode(FLISTTMP);
+     print FLISTTMP while <FLIST>;
+     close(FLISTTMP);
+     close(FLIST);
+     rename($TMP_I,$FLIST_);
      &flist_append if $APPENDMODE;
      &flist_index;
      &registration_file_put;


   Best regards,
--
Ken-ichi Hirose (^^)k!
e-mail: hirose@xxxxxxxxxxxxxxxxxxxx