--- trunk/all2xml.pl 2003/07/14 18:20:27 108 +++ trunk/all2xml.pl 2003/10/29 21:27:00 135 @@ -181,8 +181,8 @@ if (@index_data) { if ($index_filter) { no strict 'refs'; - foreach my $d (&$index_filter(@index_data)) { - $index->insert($field, $d, $path); + foreach my $d (@index_data) { + $index->insert($field, &$index_filter($d), $path); } } else { foreach my $d (@index_data) { @@ -332,12 +332,19 @@ # if so, erase it and re-open database sub check_txt_db { my $isis_db = shift || die "need isis database name"; + my $reopen = 0; + if (-e $isis_db.".TXT") { - print STDERR "WARNING: removing .txt OpenIsis database...\n"; + print STDERR "WARNING: removing $isis_db.TXT OpenIsis database...\n"; unlink $isis_db.".TXT" || warn "FATAL: unlink error on '$isis_db.TXT': $!"; - my $db = OpenIsis::open( $isis_db ); - return $db; + $reopen++; + } + if (-e $isis_db.".PTR") { + print STDERR "WARNING: removing $isis_db.PTR OpenIsis database...\n"; + unlink $isis_db.".PTR" || warn "FATAL: unlink error on '$isis_db.PTR': $!"; + $reopen++; } + return OpenIsis::open( $isis_db ) if ($reopen); } # EOF error