--- trunk/all2xml.pl	2005/01/02 22:09:01	628
+++ trunk/all2xml.pl	2005/01/27 17:55:09	647
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use IsisDB;
+use Biblio::Isis;
 use Getopt::Std;
 use Data::Dumper;
 use XML::Simple;
@@ -22,7 +22,8 @@
 my $config;
 
 #use index_DBI;		# default DBI module for index
-use index_DBI_cache;	# faster DBI module using memory cache
+#use index_DBI_cache;	# faster DBI module using memory cache
+use index_DBI_filter;	# filter support for indexes
 my $index;
 
 my %opts;
@@ -257,8 +258,6 @@
 			# init vars so that we go into while...
 			($swish,$display) = (1,1);
 
-			# placeholder for all repeatable entries for index
-
 			sub mkformat($$) {
 				my $x = shift || die "mkformat needs tag reference";
 				my $data = shift || return;
@@ -737,13 +736,18 @@
 		my $isis_db = $cfg -> val($database, 'isis_db') || die "$database doesn't have 'isis_db' defined!";
 
 		$import2cp = Text::Iconv->new($config->{isis_codepage},$codepage);
-		my $db = new IsisDB( isisdb => $isis_db );
+		my $db = new Biblio::Isis( isisdb => $isis_db );
+
+		my $max_rowid = $db->count;
 
-		my $max_rowid = $db->{'maxmfn'} || die "can't find maxmfn";
+		if (! $max_rowid) {
+			print STDERR "FATAL: can't read database: $isis_db, skipping...\n";
+			next;
+		}
 
 		print STDERR "Reading database: $isis_db [$max_rowid rows]\n";
 
-		my $path = $database;
+		$path = $database;
 
 		for (my $row_id = 1; $row_id <= $max_rowid; $row_id++ ) {
 			my $row = $db->to_hash( $row_id );