if field in eval isn't repeatable use first value,

return eval errors

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@381 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/parse_format.pm b/parse_format.pm
index e5b23a6..3f4d50d 100644 (file)
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -163,15 +163,17 @@ sub parse_iso_format {
                sub fld2str {
                        my ($func,$row,$f,$sf,$i) = @_;
 #print STDERR "## in fld2str\n";
-                       my $tmp = $codepage->convert(&$func($row,$f,$sf,$i)) || '';
+                       my $tmp = $codepage->convert(&$func($row,$f,$sf,$i)) ||  $codepage->convert(&$func($row,$f,$sf,0)) || '';
                        return "'$tmp'";
                }
 
                $eval =~ s/v(\d+)\^(\w*)/fld2str($func,$row,$1,$2,$i)/eg;
 #print STDERR "## eval: $eval\n";
                if (eval "$eval") {
+                       die "eval error: eval{$eval}: $@" if ($@);
                        return ($swish,$display);
                } else {
+                       die "eval error: eval{$eval}: $@" if ($@);
                        return (undef,undef);
                }
        }