--- trunk/all2xml.pl	2003/07/13 21:57:12	97
+++ trunk/all2xml.pl	2003/11/16 22:42:41	153
@@ -82,17 +82,17 @@
 
 	# sort subrouting using order="" attribute
 	sub by_order {
-		return 0 if (! $config->{indexer}->{$a}->{order});
-		return 0 if (! $config->{indexer}->{$b}->{order});
+		my $va = $config->{indexer}->{$a}->{order} ||
+			$config->{indexer}->{$a};
+		my $vb = $config->{indexer}->{$b}->{order} ||
+			$config->{indexer}->{$b};
 
-		return $config->{indexer}->{$a}->{order} <=>
-			$config->{indexer}->{$b}->{order} ;
+		return $va <=> $vb;
 	}
 
 	foreach my $field (sort by_order keys %{$config->{indexer}}) {
 
 		$field=x($field);
-
 		$field_usage{$field}++;
 
 		my $swish_data = "";
@@ -128,6 +128,32 @@
 			my @index_data;
 			my $index_filter;
 
+			sub mkformat {
+				my $x = shift || die "mkformat needs tag reference";
+				my $data = shift || return;
+				my $format_name = x($x->{format_name}) || return $data;
+				my $fmt = x($config->{format}->{$format_name}->{content}) || die "<format name=\"$format_name\"> is not defined!";
+				my $format_delimiter = x($x->{format_delimiter});
+				my @data;
+				if ($format_delimiter) {
+					@data = split(/$format_delimiter/,$data);
+				} else {
+					push @data,$data;
+				}
+
+				if ($fmt) {
+					my $nr = scalar $fmt =~ s/%s/%s/g;
+					if (($#data+1) == $nr) {
+						return sprintf($fmt,@data);
+					} else {
+						print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
+						return $data;
+					}
+				} else {
+					print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
+				}
+			}
+
 			# while because of repeatable fields
 			while ($swish || $display) {
 				($swish,$display) = parse_format($type, $format,$row,$repeat_off++,$import2cp);
@@ -160,12 +186,16 @@
 					}
 					if ($filter) {
 						no strict 'refs';
-						$display_data .= join($delimiter,&$filter($display));
+						if ($display_data) {
+							$display_data .= $delimiter.join($delimiter,mkformat($x,&$filter($display)));
+						} else {
+							$display_data = join($delimiter,mkformat($x,&$filter($display)));
+						}
 					} else {
 						if ($display_data) {
-							$display_data .= $delimiter.$display;
+							$display_data .= $delimiter.mkformat($x,$display);
 						} else {
-							$display_data .= $display;
+							$display_data = mkformat($x,$display);
 						}
 					}
 				}
@@ -181,8 +211,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) {
@@ -289,12 +319,12 @@
 	my $type_base = $type;
 	$type_base =~ s/_.+$//g;
 
-	$config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config' ], forcecontent => 1);
+	$config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config', 'format' ], forcecontent => 1);
 
 	# output current progress indicator
 	my $last_p = 0;
 	sub progress {
-		# XXX return if ($show_progress ne "");
+		return if (! $show_progress);
 		my $current = shift;
 		my $total = shift || 1;
 		my $p = int($current * 100 / $total);
@@ -306,6 +336,7 @@
 
 	my $fake_dir = 1;
 	sub fakeprogress {
+		return if (! $show_progress);
 		my $current = shift @_;
 
 		my @ind = ('-','\\','|','/','-','\\','|','/', '-');
@@ -327,8 +358,56 @@
 		$import2cp = Text::Iconv->new($config->{isis_codepage},$codepage);
 		my $db = OpenIsis::open( $isis_db );
 
+		# check if .txt database for OpenIsis is zero length,
+		# 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 $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 == -1) {
+				print STDERR "FATAL: OpenIsis can't open zero size file $isis_db\n";
+				next;
+			}
+		}
+
+		# OpenIsis::ERR_BADF 
+		if ($db == -4) {
+			print STDERR "FATAL: OpenIsis can't find file $isis_db\n";
+			next;
+		# OpenIsis::ERR_IO
+		} elsif ($db == -5) {
+			print STDERR "FATAL: OpenIsis can't access file $isis_db\n";
+			next;
+		} elsif ($db < 0) {
+			print STDERR "FATAL: OpenIsis unknown error $db with file $isis_db\n";
+			next;
+		}
+
 		my $max_rowid = OpenIsis::maxRowid( $db );
 
+		# if 0 records, try to rease isis .txt database
+		if ($max_rowid == 0) {
+			# force removal of database
+			$db = check_txt_db($isis_db);
+			$max_rowid = OpenIsis::maxRowid( $db );
+		}
+
 		print STDERR "Reading database: $isis_db [$max_rowid rows]\n";
 
 		my $path = $database;
@@ -350,6 +429,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") {