renamed tag to finger to avoid confusion (I tried to exmplain why I use term
[webpac] / all2xml.pl
index 0722b30..ee41297 100755 (executable)
@@ -1,25 +1,29 @@
 #!/usr/bin/perl -w
 
 use strict;
-use OpenIsis;
+use Biblio::Isis;
 use Getopt::Std;
 use Data::Dumper;
 use XML::Simple;
-use Text::Unaccent 1.02;       # 1.01 won't compile on my platform,
 use Text::Iconv;
 use Config::IniFiles;
 use Encode;
+#use GDBM_File;
+use Fcntl;     # for O_RDWR
+use TDB_File;
 
 $|=1;
 
 my $config_file = $0;
 $config_file =~ s/\.pl$/.conf/;
+$config_file = $ARGV[0] if ($ARGV[0] && -f $ARGV[0]);
 die "FATAL: can't find configuration file '$config_file'" if (! -e $config_file);
 
 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;
@@ -61,6 +65,16 @@ my %type2tag = (
        'feed' => 'feed'
 );
 
+my $cache;     # for cacheing
+
+# lookup hash (tied to file)
+my %lhash;
+# this option will cache all lookup entries in memory.
+# if you are tight on memory, turn this off
+my $use_lhash_cache = 1;
+
+my $last_field_name;   # cache to prevent repeated fields
+
 sub data2xml {
 
        use xmlify;
@@ -90,33 +104,153 @@ sub data2xml {
                return $va <=> $vb;
        }
 
-       foreach my $field (sort by_order keys %{$config->{indexer}}) {
+       my @sorted_tags;
+       if ($cache->{tags_by_order}) {
+               @sorted_tags = @{$cache->{tags_by_order}};
+       } else {
+               @sorted_tags = sort by_order keys %{$config->{indexer}};
+               $cache->{tags_by_order} = \@sorted_tags;
+       }
+
+       # lookup key
+       my $lookup_key;
+
+       # cache for field in pages
+       delete $cache->{display_data};
+       delete $cache->{swish_data};
+       delete $cache->{swish_exact_data};
+       delete $cache->{index_data};
+       delete $cache->{index_delimiter};
+       my @page_fields;        # names of fields
+
+
+       # subs used to produce output
+
+       sub get_field_name($$$) {
+               my ($config,$field,$field_usage) = @_;
+
+               # find field name (signular, plural)
+               my $field_name = "";
+               if ($config->{indexer}->{$field}->{name_singular} && $field_usage == 1) {
+                       $field_name = $config->{indexer}->{$field}->{name_singular};
+               } elsif ($config->{indexer}->{$field}->{name_plural}) {
+                       $field_name = $config->{indexer}->{$field}->{name_plural};
+               } elsif ($config->{indexer}->{$field}->{name}) {
+                       $field_name = $config->{indexer}->{$field}->{name};
+               } else {
+                       print STDERR "WARNING: field '$field' doesn't have 'name' attribute!";
+               }
+
+               if ($field_name) {
+                       $field_name = x($field_name);
+                       if (! $last_field_name) {
+                               $last_field_name = $field_name;
+                               return $last_field_name;
+                       } elsif ($field_name ne $last_field_name) {
+                               $last_field_name = $field_name;
+                               return $last_field_name;
+                       }
+               }
+       }
+
+
+       # init variables for different types
+       sub init_visible_type($) {
+               my $type = shift;
+
+               # swish, swish_exact, display, index, index_lookup
+               # swish and display defaults
+               my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
+               if (lc($type) eq "display") {
+                       $s = 0;
+               } elsif (lc($type) eq "swish") {
+                       $d = 0;
+               } elsif (lc($type) eq "index") {
+                       ($s,$se,$d,$i) = (0,1,0,1);
+               } elsif (lc($type) eq "swish_exact") {
+                       ($s,$se,$d,$i) = (0,1,0,0);
+               } elsif (lc($type) =~ /^lookup/) {
+                       ($s,$se,$d,$i,$il) = (0,1,0,0,1);
+               } elsif ($type) {
+                       print STDERR "WARNING: unknown type: $type\n";
+               }
+               return ($s,$se,$d,$i,$il);
+       }
+
+
+       # convert
+       #
+       # <tag>
+       #  <delimiter>, </delimiter>
+       #  <value>200a</value>
+       # </tag>
+       # 
+       # to
+       #
+       # <tag delimiter=", ">200a</tag>
+       #
+       # but without loosing spaces in delimiter (becasue
+       # new XML::Simple strips spaces in attribute values
+       # as defined in XML specification)
+       #
+       sub unroll_x($) {
+               my $x = shift;
+
+               if (defined $x->{value}) {
+                       my ($v,$d) = ($x->{value}->{content}, $x->{delimiter}->{content});
+                       delete $x->{value};
+                       delete $x->{delimiter};
+                       $x->{content} = $v;
+                       $x->{delimiter} = $d;
+               }
+               return $x;
+       }
+
+       # begin real work: go field by field
+       foreach my $field (@sorted_tags) {
 
                $field=x($field);
                $field_usage{$field}++;
 
                my $swish_data = "";
+               my $swish_exact_data = "";
                my $display_data = "";
+               my @index_data;
                my $line_delimiter;
 
                my ($swish,$display);
 
                my $tag = $type2tag{$type} || die "can't find which tag to use for type $type";
+
+               # is this field page-by-page?
+               my $iterate_by_page = $config->{indexer}->{$field}->{iterate_by_page};
+               push @page_fields,$field if ($iterate_by_page);
+               my %page_max = ();
+               # default line_delimiter if using
+               my $page_line_delimiter = $config->{indexer}->{$field}->{page_line_delimiter} || '<br/>';
+               $cache->{index_delimiter}->{$field} = $config->{indexer}->{$field}->{index_delimiter};
+
+               my $format_name = $config->{indexer}->{$field}->{format_name};
+               my $format_delimiter = $config->{indexer}->{$field}->{format_delimiter};
+               if ($format_name && $format_delimiter) {
+                       $cache->{format}->{$field}->{format_name} = $format_name;
+                       $cache->{format}->{$field}->{format_delimiter} = $format_delimiter;
+               }
+
                foreach my $x (@{$config->{indexer}->{$field}->{$tag}}) {
 
+                       $x = unroll_x($x);
+
                        my $format = x($x->{content});
                        my $delimiter = x($x->{delimiter}) || ' ';
 
-                       my $repeat_off = 0;             # repeatable offset
+                       my $repeat_off = 0;     # init repeatable offset
 
-                       my ($s,$d,$i) = (1,1,0);        # swish, display default
-                       $s = 0 if (lc($x->{type}) eq "display");
-                       $d = 0 if (lc($x->{type}) eq "swish");
-                       ($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+                       my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
                        # what will separate last line from this one?
-                       if ($display_data && $x->{append} && $x->{append} eq "1") {
-                               $line_delimiter = ' ';
+                       if ($display_data && $x->{append}) {
+                               $line_delimiter = $delimiter;
                        } elsif ($display_data) {
                                $line_delimiter = '<br/>';
                        }
@@ -124,126 +258,331 @@ sub data2xml {
                        # init vars so that we go into while...
                        ($swish,$display) = (1,1);
 
-                       # placeholder for all repeatable entries for index
-                       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) {
+                               my $page = $repeat_off;
+                               $page_max{$field} = $page if ($iterate_by_page && $page > ($page_max{$field} || 0));
                                ($swish,$display) = parse_format($type, $format,$row,$repeat_off++,$import2cp);
                                if ($repeat_off > 1000) {
                                        print STDERR "loop (more than 1000 repeatable fields) deteced in $row, $format\n";
                                        last;
                                }
-                               
+
+                               # is this field is lookup?
+                               if ($display && $x->{lookup}) {
+                                       my $null = "<!-- null -->";
+                                       if ($use_lhash_cache) {
+                                               if (!defined($cache->{lhash}->{$display})) {
+                                                       my $new_display = $lhash{$display};
+                                                       if (defined($new_display)) {
+#print STDERR "lookup cache store '$display' = '$new_display'\n";
+                                                               $display = $new_display;
+                                                               $cache->{lhash}->{$display} = $new_display;
+                                                       } else {
+#                                                              print STDERR "WARNING: lookup for '$display' didn't find anything.\n";
+                                                               $display = "";
+                                                               $cache->{lhash}->{$display} = $null;
+                                                       }
+                                               } else {
+                                                       $display = $cache->{lhash}->{$display};
+                                               }
+                                       } else {
+                                               $display = $lhash{$display} || $null;
+                                       }
+                               }
+
                                # filter="name" ; filter this field through
                                # filter/[name].pm
                                my $filter = $x->{filter};
-                               if ($filter) {
+                               if ($filter && !$cache->{filter_loaded}->{$filter}) {
                                        require "filter/".$filter.".pm";
+                                       $cache->{filter_loaded}->{$filter}++;
                                }
                                # type="swish" ; field for swish
-                               if ($s && $swish) {
-                                       if ($filter) {
+                               if ($swish) {
+                                       my $tmp = $swish;
+                                       if ($filter && ($s || $se)) {
                                                no strict 'refs';
-                                               $swish_data .= join(" ",&$filter($swish));
-                                       } else {
-                                               $swish_data .= $swish;
+                                               $tmp = join(" ",&$filter($tmp)) if ($s || $se);
                                        }
+
+                                       $swish_data .= $tmp if ($s && $tmp);
+                                       $swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
                                }
 
                                # type="display" ; field for display
                                if ($d && $display) {
+                                       my $ldel = $delimiter;
                                        if ($line_delimiter && $display_data) {
-                                               $display_data .= $line_delimiter;
-                                               undef $line_delimiter;
+                                               $ldel = $line_delimiter;
                                        }
                                        if ($filter) {
                                                no strict 'refs';
-                                               $display_data .= join($delimiter,&$filter($display));
-                                       } else {
-                                               if ($display_data) {
-                                                       $display_data .= $delimiter.$display;
-                                               } else {
-                                                       $display_data .= $display;
+                                               my @arr;
+                                               foreach my $tmp (&$filter($display)) {
+                                                       my $tmp2 = mkformat($x,$tmp);
+                                                       push @arr,$tmp2 if ($tmp2);
                                                }
+                                               $display_data .= $ldel if ($display_data && @arr);
+                                               $display_data .= join($delimiter,@arr);
+                                       } else {
+                                               $display_data .= $ldel if ($display_data);
+                                               my $tmp = mkformat($x,$display);
+                                               $display_data .= $tmp if ($tmp);
                                        }
                                }
                                                
                                # type="index" ; insert into index
+                               my $idisplay;
                                if ($i && $display) {
-                                       push @index_data, $display;
-                                       $index_filter = $filter if ($filter);
+                                       $idisplay = $display;
+                                       if ($filter) {
+                                               no strict 'refs';
+                                               $idisplay = &$filter($idisplay);
+                                       }
+                                       push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
                                }
-                       }
 
-                       # fill data in index
-                       if (@index_data) {
-                               if ($index_filter) {
-                                       no strict 'refs';
-                                       foreach my $d (&$index_filter(@index_data)) {
-                                               $index->insert($field, $d, $path);
+                               # store fields in lookup
+                               if ($il && $display) {
+                                       if (lc($x->{type}) eq "lookup_key") {
+                                               if ($lookup_key) {
+                                                       print STDERR "WARNING: try to redefine lookup_key (keys shouldn't be repeatable fields!)";
+                                               } else {
+                                                       if ($filter) {
+                                                               no strict 'refs';
+                                                               $lookup_key = &$filter($display);
+                                                       } else {
+                                                               $lookup_key = $display;
+                                                       }
+                                               }
+                                       } elsif (lc($x->{type}) eq "lookup_val") {
+                                               if ($lookup_key) {
+                                                       if ($filter) {
+                                                               no strict 'refs';
+                                                               $lhash{$lookup_key} = &$filter($display);
+                                                       } else {
+                                                               $lhash{$lookup_key} = $display;
+                                                       }
+                                               } else {
+                                                       print STDERR "WARNING: no lookup_key defined for  '$display'?";
+                                               }
                                        }
-                               } else {
-                                       foreach my $d (@index_data) {
-                                               $index->insert($field, $d, $path);
+
+                               }
+
+                               # store data for page-by-page repeatable fields
+                               if ($iterate_by_page) {
+                                       sub iterate_fld($$$$$$) {
+                                               my ($cache,$what,$field,$page,$data,$append) = @_;
+                                               return if (!$data);
+
+                                               my $ldel = $page_line_delimiter;
+                                               $ldel = " " if ($append);
+#print STDERR "line delimiter: ",Dumper($ldel) if ($ldel);
+                                               if (! $cache->{$what}->{$field}->[$page]) {
+                                                       $cache->{$what}->{$field}->[$page] = $data;
+                                               } else {
+                                                       $cache->{$what}->{$field}->[$page] .= $ldel.$data;
+                                               }
+                                       }
+
+                                       if ($display_data) {
+                                               iterate_fld($cache,'display_data',$field,$page,$display_data,$x->{append});
+                                       }
+                                               $display_data = "";
+                                       if ($swish_data) {
+                                               iterate_fld($cache,'swish_data',$field,$page,$swish_data,$x->{append});
+                                               $swish_data = "";
+                                       }
+                                       if ($swish_exact_data) {
+                                               iterate_fld($cache,'swish_exact_data',$field,$page,$swish_exact_data,$x->{append});
+                                               $swish_exact_data = "";
+                                       }
+
+                                       if ($idisplay) {
+                                               my $ldel=$page_line_delimiter;
+                                               my @index_data;
+                                               if ($cache->{index_data}->{$field}->[$page]) {
+
+                                                       @index_data = @{$cache->{index_data}->{$field}->[$page]};
+                                               }
+                                               if ($x->{append}) {
+                                                       if (@index_data) {
+                                                               $index_data[$#index_data] .= $idisplay;
+                                                       } else {
+                                                               push @index_data, $idisplay;
+                                                       }
+                                               } else {
+                                                       push @index_data, $idisplay;
+                                               }
+                                               $idisplay = "";
+                                               @{$cache->{index_data}->{$field}->[$page]} = @index_data;
                                        }
                                }
                        }
+
+                       if (! $iterate_by_page) {
+                               my $idel = $x->{index_delimiter};
+                               # fill data in index
+                               foreach my $tmp (@index_data) {
+                                       my $i = $d = $tmp;
+                                       if ($idel && $tmp =~ m/$idel/) {
+                                               ($i,$d) = split(/$idel/,$tmp);
+                                       }
+                                       $index->insert($field, $i, $d, $path);
+                               }
+                               @index_data = ();
+                       }
                }
 
                # now try to parse variables from configuration file
                foreach my $x (@{$config->{indexer}->{$field}->{'config'}}) {
 
+                       $x = unroll_x($x);
+
                        my $delimiter = x($x->{delimiter}) || ' ';
                        my $val = $cfg->val($database, x($x->{content}));
 
-                       my ($s,$d,$i) = (1,1,0);        # swish, display default
-                       $s = 0 if (lc($x->{type}) eq "display");
-                       $d = 0 if (lc($x->{type}) eq "swish");
-                       ($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+                       # FIXME index_lookup is not supported!
+                       my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
                        if ($val) {
                                $display_data .= $delimiter.$val if ($d);
-                               $swish_data .= $val if ($s);
+                               $swish_data .= " ".$val if ($s);
                                $index->insert($field, $val, $path) if ($i);
                        }
 
+                       if ($iterate_by_page) {
+                               # FIXME data from config tag will appear just
+                               # on first page!!!
+                               my $page = 0;
+                               if ($display_data) {
+                                       $cache->{display_data}->{$field}->[$page] = $display_data;
+                                       $display_data = "";
+                               }
+                               if ($swish_data) {
+                                       $cache->{swish_data}->{$field}->[$page] = $swish_data;
+                                       $swish_data = "";
+                               }
+                               if ($swish_exact_data) {
+                                       $cache->{swish_exact_data}->{$field}->[$page] = $swish_exact_data;
+                                       $swish_exact_data = "";
+                               }
+                       }
                }
 
+               # save data page-by-page
+               foreach my $field (@page_fields) {
+                       my $nr_pages = $page_max{$field} || next;
+#print STDERR "field '$field' iterate over ",($nr_pages || 0)," pages...\n";
+#print STDERR Dumper($cache->{display_data});
+                       for (my $page=0; $page <= $nr_pages; $page++) {
+                               my $display_data;
+                               if ($cache->{format}->{$field}) {
+                                       my $tmp = mkformat($cache->{format}->{$field},$cache->{display_data}->{$field}->[$page]);
+                                       $display_data=$tmp if ($tmp);
+                               } else {
+                                       $display_data = $cache->{display_data}->{$field}->[$page];
+                               }
+                               if ($display_data) { # default
+                                       if ($field eq "headline") {
+                                               $xml .= xmlify("headline", $display_data);
+                                       } else {
 
-               if ($display_data) {
+                                               # fallback to empty field name if needed
+                                               $html .= get_field_name($config,$field,$field_usage{$field}) || '';
+                                               $html .= "#-#".$display_data."###\n";
+                                       }
+                               }
+                               
+                               my $swish_data = $cache->{swish_data}->{$field}->[$page];
+                               if ($swish_data) {
+                                       # remove extra spaces
+                                       $swish_data =~ s/ +/ /g;
+                                       $swish_data =~ s/ +$//g;
+
+                                       $xml .= xmlify($field."_swish", my_unac_string($codepage,$swish_data));
+                               }
 
-                       if ($field eq "headline") {
-                               $xml .= xmlify("headline", $display_data);
-                       } else {
+                               my $swish_exact_data = $cache->{swish_exact_data}->{$field}->[$page];
+                               if ($swish_exact_data) {
+                                       $swish_exact_data =~ s/ +/ /g;
+                                       $swish_exact_data =~ s/ +$//g;
 
-                               # find field name (signular, plural)
-                               my $field_name = "";
-                               if ($config->{indexer}->{$field}->{name_singular} && $field_usage{$field} == 1) {
-                                       $field_name = $config->{indexer}->{$field}->{name_singular}."#-#";
-                               } elsif ($config->{indexer}->{$field}->{name_plural}) {
-                                       $field_name = $config->{indexer}->{$field}->{name_plural}."#-#";
-                               } elsif ($config->{indexer}->{$field}->{name}) {
-                                       $field_name = $config->{indexer}->{$field}->{name}."#-#";
-                               } else {
-                                       print STDERR "WARNING: field '$field' doesn't have 'name' attribute!";
+                                       # add delimiters before and after word.
+                                       # That is required to produce exact match
+                                       $xml .= xmlify($field."_swish_exact", my_unac_string($codepage,$swish_exact_data));
                                }
-                               if ($field_name) {
-                                       $html .= x($field_name);
+                               
+                               my $idel = $cache->{index_delimiter}->{$field};
+                               foreach my $tmp (@{$cache->{index_data}->{$field}->[$page]}) {
+                                       my $i = $tmp;
+                                       my $d = $tmp;
+                                       if ($idel && $tmp =~ m/$idel/) {
+                                               ($i,$d) = split(/$idel/,$tmp);
+                                       }
+                                       $index->insert($field, $i, $d, $path);
+#print STDERR "index [$idel] $field: $i --> $d [$path]\n";
                                }
-                               $html .= $display_data."###\n";
                        }
+       
                }
-               if ($swish_data) {
-                       # remove extra spaces
-                       $swish_data =~ s/ +/ /g;
-                       $swish_data =~ s/ +$//g;
+               
+               if (! $iterate_by_page) {
+                       if ($display_data) {
+                               if ($field eq "headline") {
+                                       $xml .= xmlify("headline", $display_data);
+                               } else {
 
-                       $xml .= xmlify($field."_swish", unac_string($codepage,$swish_data));
-               }
+                                       # fallback to empty field name if needed
+                                       $html .= get_field_name($config,$field,$field_usage{$field}) || '';
+                                       $html .= "#-#".$display_data."###\n";
+                               }
+                       }
+                       if ($swish_data) {
+                               # remove extra spaces
+                               $swish_data =~ s/ +/ /g;
+                               $swish_data =~ s/ +$//g;
 
+                               $xml .= xmlify($field."_swish", my_unac_string($codepage,$swish_data));
+                       }
 
+                       if ($swish_exact_data) {
+                               $swish_exact_data =~ s/ +/ /g;
+                               $swish_exact_data =~ s/ +$//g;
+
+                               # add delimiters before and after word.
+                               # That is required to produce exact match
+                               $xml .= xmlify($field."_swish_exact", my_unac_string($codepage,$swish_exact_data));
+                       }
+               }
        }
 
        # dump formatted output in <html>
@@ -278,107 +617,140 @@ $index = new index_DBI(
 
 my $show_progress = $cfg_global->val('global', 'show_progress');
 
+my $my_unac_filter = $cfg_global->val('global', 'my_unac_filter');
+if ($my_unac_filter) {
+       print STDERR "using $my_unac_filter to filter characters for search\n";
+       require $my_unac_filter;
+} else {
+       print STDERR "### fallback to default my_unac_string!\n";
+       eval q{
+       sub main::my_unac_string($$) {
+               my ($charset, $string) = (@_);
+               return $string;
+       }
+       };
+}
+
 foreach my $database ($cfg->Sections) {
 
        my $type = lc($cfg -> val($database, 'type')) || die "$database doesn't have 'type' defined";
        my $add_xml = $cfg -> val($database, 'xml');    # optional
 
+       # create new lookup file
+       my $lookup_file = $cfg -> val($database, 'lookup_newfile'); # optional
+       if ($lookup_file) {
+               #tie %lhash, 'GDBM_File', $lookup_file, &GDBM_NEWDB, 0644;
+               if (! -e $lookup_file) {
+                       open(LOOKUP, "> $lookup_file") || die "can't create $lookup_file': $!";
+                       close(LOOKUP);
+               }
+               tie %lhash, 'TDB_File', $lookup_file, TDB_CLEAR_IF_FIRST, O_RDWR, 0644;
+               print STDERR "creating lookup file '$lookup_file'\n";
+               # delete memory cache for lookup file
+               delete $cache->{lhash};
+       }
+
+       # open existing lookup file
+       $lookup_file = $cfg -> val($database, 'lookup_open'); # optional
+       if ($lookup_file) {
+               #tie %lhash, 'GDBM_File', $lookup_file, &GDBM_READER, 0644;
+               tie %lhash, 'TDB_File', $lookup_file, TDB_DEFAULT, O_RDWR, 0644;
+               print STDERR "opening lookup file '$lookup_file'\n";
+       }
+
 print STDERR "reading ./import_xml/$type.xml\n";
 
        # extract just type basic
        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 );
+
+       # helper for progress bar
+       sub fmt_time {
+               my $t = shift || 0;
+               my $out = "";
+
+               my ($ss,$mm,$hh) = gmtime($t);
+               $out .= "${hh}h" if ($hh);
+               $out .= sprintf("%02d:%02d", $mm,$ss);
+               $out .= "  " if ($hh == 0);
+               return $out;
+       }
 
        # output current progress indicator
        my $last_p = 0;
+       my $start_t = time();
        sub progress {
                return if (! $show_progress);
                my $current = shift;
                my $total = shift || 1;
                my $p = int($current * 100 / $total);
-               if ($p != $last_p) {
-                       printf STDERR ("%5d / %5d [%-51s] %-2d %% \r",$current,$total,"=" x ($p/2).">", $p );
+               if ($p < $last_p || $current == 1) {
+                       $start_t = time();
+                       $last_p = 0;
+               } elsif ($p != $last_p) {
+                       my $rate = ($current / (time() - $start_t || 1));
+                       my $eta = ($total-$current) / ($rate || 1);
+                       printf STDERR ("%5d [%-38s] %-5d %0.1f/s %s\r",$current,"=" x ($p/3)."$p%>", $total, $rate, fmt_time($eta));
                        $last_p = $p;
                }
        }
 
        my $fake_dir = 1;
+       my $fake_pos = 0;
+       my $last_fake_t = time();
        sub fakeprogress {
                return if (! $show_progress);
                my $current = shift @_;
 
-               my @ind = ('-','\\','|','/','-','\\','|','/', '-');
+               my @ind = ('-','\\','|','/','-','\\','|','/');
+
+               if ($current < $fake_pos) {
+                       $start_t = time();
+                       $last_fake_t = 0;
+                       $fake_dir = 1;
+                       $fake_pos = 0;
+               }
 
-               $last_p += $fake_dir;
-               $fake_dir = -$fake_dir if ($last_p > 1000 || $last_p < 0);
-               if ($last_p % 10 == 0) {
-                       printf STDERR ("%5d / %5s [%-51s]\r",$current,"?"," " x ($last_p/20).$ind[($last_p/20) % $#ind]);
+               if (time()-$last_fake_t >= 1) {
+                       $last_fake_t = time();
+                       $fake_pos += $fake_dir;
+                       $fake_dir = -$fake_dir if ($fake_pos > 38);
+               }
+
+               if ($current % 10 == 0) {
+                       my $rate = ($current / (time() - $start_t || 1));
+                       printf STDERR ("%5d [%-38s] %0.1f/s\r",$current, " " x $fake_pos .$ind[($current / 10) % 8], $rate);
                }
        }
 
        # now read database
 print STDERR "using: $type...\n";
 
+       # erase cache for tags by order in this database
+       delete $cache->{tags_by_order};
+
        if ($type_base eq "isis") {
 
                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 = 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";
-                       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;
-                       }
-               }
-
-               # EOF error
-               if ($db == -1) {
-                       $db = check_txt_db($isis_db);
-                       if (! $db) {
-                               print STDERR "FATAL: OpenIsis can't open zero size file $isis_db\n";
-                               next;
-                       }
-               }
+               my $db = new Biblio::Isis( isisdb => $isis_db );
 
-               # 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 );
-               }
+               my $max_rowid = $db->count || die "can't find maxmfn";
 
                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 = OpenIsis::read( $db, $row_id );
-                       if ($row && $row->{mfn}) {
-       
+                       my $row = $db->to_hash( $row_id );
+                       if ($row) {
+
+                               $row->{mfn} = $row_id;
+                               $row->{record} = $db->{record};
+
                                progress($row->{mfn}, $max_rowid);
 
                                my $swishpath = $path."#".int($row->{mfn});
@@ -395,8 +767,9 @@ print STDERR "using: $type...\n";
                print STDERR "\n";
 
        } elsif ($type_base eq "excel") {
-               use Spreadsheet::ParseExcel;
-               use Spreadsheet::ParseExcel::Utility qw(int2col);
+               require Spreadsheet::ParseExcel;
+               require Spreadsheet::ParseExcel::Utility;
+               import Spreadsheet::ParseExcel::Utility qw(int2col);
                
                $import2cp = Text::Iconv->new($config->{excel_codepage},$codepage);
                my $excel_file = $cfg -> val($database, 'excel_file') || die "$database doesn't have 'excel_file' defined!";
@@ -424,7 +797,11 @@ print STDERR "using: $type...\n";
                        for(my $iC = $oWorksheet->{MinCol} ; defined $oWorksheet->{MaxCol} && $iC <= $oWorksheet->{MaxCol} ; $iC++) {
                                my $cell = $oWorksheet->{Cells}[$iR][$iC];
                                if ($cell) {
-                                       $row->{int2col($iC)} = $cell->Value;
+                                       # this conversion is a cludge.
+                                       # Files from Excell could have
+                                       # characters which don't fit into
+                                       # destination encoding.
+                                       $row->{int2col($iC)} = $utf2cp->convert($cell->Value) || $cell->Value;
                                }
                        }
 
@@ -450,33 +827,40 @@ print STDERR "using: $type...\n";
                }
        } elsif ($type_base eq "marc") {
 
-               use MARC;
+               require MARC::File::USMARC;
                
                $import2cp = Text::Iconv->new($config->{marc_codepage},$codepage);
                my $marc_file = $cfg -> val($database, 'marc_file') || die "$database doesn't have 'marc_file' defined!";
 
                # optional argument is format
-               my $format = x($config->{format}) || 'usmarc';
-
+               warn "marc_format is no longer used!" if ($config->{marc_format});
                print STDERR "Reading MARC file '$marc_file'\n";
 
-               my $marc = new MARC;
-               my $nr = $marc->openmarc({
-                               file=>$marc_file, format=>$format
-                       }) || die "Can't open MARC file '$marc_file'";
+               my $marc = MARC::File::USMARC->in( $marc_file )
+                       || die "Can't open MARC file '$marc_file': ".$MARC::File::ERROR;
 
-               my $i=0;        # record nr.
+               # count records in MARC file
+               sub marc_count {
+                       my $filename = shift || die;
+                       my $file = MARC::File::USMARC->in($filename) || die $MARC::File::ERROR;
+                       my $count = 0;
+                       while ($file->skip()) {
+                               $count++;
+                       }
+                       return $count;
+               }
+
+               my $count = marc_count($marc_file) || warn "no records in '$marc_file'?";
 
-               my $rec;
+               my $i = 0;
 
-               while ($marc->nextmarc(1)) {
+               while( my $rec = $marc->next() ) {
 
-                       # XXX
-                       fakeprogress($i++);
+                       progress($i++,$count);
 
                        my $swishpath = $database."#".$i;
 
-                       if (my $xml = data2xml($type_base,$marc,$add_xml,$cfg,$database)) {
+                       if (my $xml = data2xml($type_base,$rec,$add_xml,$cfg,$database)) {
                                $xml = $cp2utf->convert($xml);
                                use bytes;      # as opposed to chars
                                print "Path-Name: $swishpath\n";
@@ -484,6 +868,9 @@ print STDERR "using: $type...\n";
                                print "Document-Type: XML\n\n$xml\n";
                        }
                }
+
+               print STDERR "\n";
+
        } elsif ($type_base eq "feed") {
 
                $import2cp = Text::Iconv->new($config->{feed_codepage},$codepage);
@@ -522,6 +909,8 @@ print STDERR "using: $type...\n";
                        fakeprogress($i);
 
                }
+               # close lookup
+               untie %lhash if (%lhash);
        }
 }
 
@@ -536,14 +925,21 @@ __END__
 
 all2xml.pl - read various file formats and dump XML for SWISH-E
 
+=head1 SYNOPSYS
+
+ $ all2xml.pl [test.conf]
+
 =head1 DESCRIPTION
 
-This command will read ISIS data file using OpenIsis perl module, MARC
+This command will read ISIS data file using IsisDB perl module, MARC
 records using MARC module and optionally Micro$oft Excel files to
 create one XML file for usage with I<SWISH-E> indexer. Dispite it's name,
 this script B<isn't general xml generator> from isis files (isis allready
 has something like that). Output of this script is tailor-made for SWISH-E.
 
+If no configuration file is specified, it will use default one called
+C<all2xml.conf>.
+
 =head1 BUGS
 
 Documentation is really lacking. However, in true Open Source spirit, source