my $f = $format;
+ my $eval;
+ $eval = $1 if ($f =~ s/^eval{([^}]+)}//);
+
if ($f =~ s/^([^\d]+)//) {
if ($f) { # there is more to parse
push @fmt,$1;
# this might be our local scpeciality -- fields 10 and 11
# (as opposed to 010 and 011) so they are strictly listed
# here
- } elsif ($f =~ s/^(1[01])//) {
+ } elsif ($f =~ s/^(1[01]\w?)//) {
push @fmt,$1;
push @fmt,undef;
} elsif ($f =~ s/^mfn//i) {
push @fmt,'mfn';
push @fmt,'';
} elsif ($f =~ s/^([^\d]+)(\d{0,3})/$2/) {
- push @fmt,$1;
+ # still prefix?
+ if ($#fmt == 0) {
+ $fmt[0] .= $1;
+ } else {
+ push @fmt,$1;
+ }
} elsif ($f =~ s/^([^\d]+\d{0,2})//) {
- push @fmt,$1;
+ if ($#fmt == 0) {
+ $fmt[0] .= $1;
+ } else {
+ push @fmt,$1;
+ }
} elsif ($f =~ s/^(\d{1,2})//) {
- push @fmt,$1;
+ if ($#fmt == 0) {
+ $fmt[0] .= $1;
+ } else {
+ push @fmt,$1;
+ }
} else {
print STDERR "unparsed format: $f\n";
$f = "";
}
}
push @fmt,'' if ($#fmt % 3 != 0); # add empty suffix
+
+ $cache->{format_eval}->{$format} = $eval; # store eval string (if any)
+
$cache->{format}->{$format} = \@fmt;
# print STDERR "storing format for '$format': [",join("|",@fmt),"]\n";
$sufix = shift @fmt;
}
$display = $prefix.$display.$sufix if ($display);
- print STDERR "format left unused: [",join("|",@fmt),"]\n" if (@fmt);
-# print STDERR "display: $display swish: $swish\n";
+ my $eval = $cache->{format_eval}->{$format};
+ if ($eval) {
+ sub fld2str {
+ my ($func,$row,$f,$sf,$i) = @_;
+#print STDERR "## in fld2str\n";
+ my $tmp = &$func($row,$f,$sf,$i) || '';
+ return "'$tmp'";
+ }
+
+ $eval =~ s/v(\d+)\^(\w*)/fld2str($func,$row,$1,$2,$i)/eg;
+#print STDERR "## eval: $eval\n";
+ if (eval "$eval") {
+ return ($swish,$display);
+ } else {
+ return (undef,undef);
+ }
+ }
+
+ if (@fmt) {
+ print STDERR "format left unused: [",join("|",@fmt),"]\n";
+ print STDERR "format: [",join("|",@{$tmp}),"]\n";
+ }
+
+# print STDERR "format: {",$format || '',"} display: {",$display || '',"} swish: {",$swish || '',"}\n";
return ($swish,$display);
}