write nice (?) message indicating that there are no results for this query

[webpac] / all2xml.pl

diff --git a/all2xml.pl b/all2xml.pl
index 0722b30..f1df073 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -128,6 +128,32 @@ sub data2xml {
                        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 @@ sub data2xml {
                                        }
                                        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 @@ sub data2xml {
                        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,7 +319,7 @@ print STDERR "reading ./import_xml/$type.xml\n";
        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;
@@ -332,18 +362,25 @@ print STDERR "using: $type...\n";
                # 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 +429,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") {