--- trunk/all2xml.pl	2003/07/14 17:09:36	106
+++ trunk/all2xml.pl	2003/11/16 11:55:18	144
@@ -160,12 +160,16 @@
 					}
 					if ($filter) {
 						no strict 'refs';
-						$display_data .= join($delimiter,&$filter($display));
+						if ($display_data) {
+							$display_data .= $delimiter.join($delimiter,&$filter($display));
+						} else {
+							$display_data = join($delimiter,&$filter($display));
+						}
 					} else {
 						if ($display_data) {
 							$display_data .= $delimiter.$display;
 						} else {
-							$display_data .= $display;
+							$display_data = $display;
 						}
 					}
 				}
@@ -181,8 +185,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,18 +336,25 @@
 		# 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";
-				unlink $isis_db.".TXT" || warn "unlink error on '$isis_db.TXT': $!";
-				my $db = OpenIsis::open( $isis_db );
-				return $db;
+				print STDERR "WARNING: removing $isis_db.TXT OpenIsis database...\n";
+				unlink $isis_db.".TXT" || warn "FATAL: unlink error on '$isis_db.TXT': $!";
+				$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
 		if ($db == -1) {
 			$db = check_txt_db($isis_db);
-			if (! $db) {
+			if ($db == -1) {
 				print STDERR "FATAL: OpenIsis can't open zero size file $isis_db\n";
 				next;
 			}
@@ -392,6 +403,10 @@
 				}
 			}
 		}
+		# for this to work with current version of OpenIsis (0.9.0)
+		# you might need my patch from
+		# http://www.rot13.org/~dpavlin/projects/openisis-0.9.0-perl_close.diff
+		OpenIsis::close($db);
 		print STDERR "\n";
 
 	} elsif ($type_base eq "excel") {