a lot of hidra-specific branches

[webpac] / all2xml.pl

diff --git a/all2xml.pl b/all2xml.pl
index 1edd247..bc764df 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -212,7 +212,8 @@ sub data2xml {
 
                        sub chk_eval($) {
                                my $data = shift;
-                               if ($data =~ s/eval{([^}]+)}//) {
+                               return if (! defined($data));
+                               if ($data && $data =~ s/\s*eval{([^}]+)}\s*//) {
                                        if (eval "$1") {
                                                return $data;
                                        } else {
@@ -270,7 +271,7 @@ sub data2xml {
                                                                $display = $new_display;
                                                                $cache->{lhash}->{$display} = $new_display;
                                                        } else {
-                                                               print STDERR "WARNING: lookup for '$display' didn't find anything.\n";
+#                                                              print STDERR "WARNING: lookup for '$display' didn't find anything.\n";
                                                                $display = "";
                                                                $cache->{lhash}->{$display} = $null;
                                                        }
@@ -301,6 +302,10 @@ sub data2xml {
                                                $swish_data .= $swish if ($s);
                                                $swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
                                        }
+
+                                       $tmp = chk_eval($tmp);
+                                       $swish_data .= $tmp if ($s && $tmp);
+                                       $swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
                                }
 
                                # type="display" ; field for display
@@ -333,7 +338,8 @@ sub data2xml {
                                                no strict 'refs';
                                                $idisplay = &$filter($idisplay);
                                        }
-                                       push @index_data, $idisplay if (! $iterate_by_page);
+                                       $idisplay = chk_eval($idisplay);
+                                       push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
                                }
 
                                # store fields in lookup