another fix for repeatable fields

[webpac] / all2xml.pl

diff --git a/all2xml.pl b/all2xml.pl
index 6767e0e..58cf077 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -82,17 +82,17 @@ sub data2xml {
 
        # 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 = "";
@@ -124,6 +124,10 @@ 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;
+
                        # while because of repeatable fields
                        while ($swish || $display) {
                                ($swish,$display) = parse_format($type, $format,$row,$repeat_off++,$import2cp);
@@ -156,26 +160,29 @@ sub data2xml {
                                        }
                                        if ($filter) {
                                                no strict 'refs';
-                                               $display_data .= join($delimiter,&$filter($display));
+                                               $display_data .= $delimiter.&$filter($display);
                                        } else {
-                                               if ($display_data) {
-                                                       $display_data .= $delimiter.$display;
-                                               } else {
-                                                       $display_data .= $display;
-                                               }
+                                               $display_data .= $delimiter.$display;
                                        }
                                }
                                                
                                # type="index" ; insert into index
                                if ($i && $display) {
-                                       my $index_data = $display;
-                                       if ($filter) {
-                                               no strict 'refs';
-                                               foreach my $d (&$filter($index_data)) {
-                                                       $index->insert($field, $d, $path);
-                                               }
-                                       } else {
-                                               $index->insert($field, $index_data, $path);
+                                       push @index_data, $display;
+                                       $index_filter = $filter if ($filter);
+                               }
+                       }
+
+                       # fill data in index
+                       if (@index_data) {
+                               if ($index_filter) {
+                                       no strict 'refs';
+                                       foreach my $d (@index_data) {
+                                               $index->insert($field, &$index_filter($d), $path);
+                                       }
+                               } else {
+                                       foreach my $d (@index_data) {
+                                               $index->insert($field, $d, $path);
                                        }
                                }
                        }
@@ -265,6 +272,8 @@ $index = new index_DBI(
                $cfg_global->val('global', 'dbi_passwd') || '',
        );
 
+my $show_progress = $cfg_global->val('global', 'show_progress');
+
 foreach my $database ($cfg->Sections) {
 
        my $type = lc($cfg -> val($database, 'type')) || die "$database doesn't have 'type' defined";
@@ -281,7 +290,7 @@ print STDERR "reading ./import_xml/$type.xml\n";
        # output current progress indicator
        my $last_p = 0;
        sub progress {
-               #return if (! $opts{q});        # FIXME
+               return if (! $show_progress);
                my $current = shift;
                my $total = shift || 1;
                my $p = int($current * 100 / $total);
@@ -293,6 +302,7 @@ print STDERR "reading ./import_xml/$type.xml\n";
 
        my $fake_dir = 1;
        sub fakeprogress {
+               return if (! $show_progress);
                my $current = shift @_;
 
                my @ind = ('-','\\','|','/','-','\\','|','/', '-');
@@ -314,8 +324,56 @@ print STDERR "using: $type...\n";
                $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;
@@ -337,6 +395,10 @@ print STDERR "using: $type...\n";
                                }
                        }
                }
+               # 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") {