# placeholder for all repeatable entries for index
- sub chk_eval($) {
- my $data = shift;
- return if (! defined($data));
- if ($data && $data =~ s/\s*eval{([^}]+)}\s*//) {
- if (eval "$1") {
- return $data;
- } else {
- return undef;
- }
- } else {
- return $data;
- }
- }
-
sub mkformat($$) {
my $x = shift || die "mkformat needs tag reference";
my $data = shift || return;
- my $format_name = x($x->{format_name}) || return chk_eval($data);
+ 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 ($fmt) {
my $nr = scalar $fmt =~ s/%s/%s/g;
if (($#data+1) == $nr) {
- return chk_eval(sprintf($fmt,@data));
+ return sprintf($fmt,@data);
} else {
#print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
- return chk_eval($data);
+ return $data;
}
} else {
print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
$tmp = join(" ",&$filter($tmp)) if ($s || $se);
}
- $tmp = chk_eval($tmp);
$swish_data .= $tmp if ($s && $tmp);
$swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
}
no strict 'refs';
$idisplay = &$filter($idisplay);
}
- $idisplay = chk_eval($idisplay);
push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
}
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;
}
}
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 "format: [",join("|",@{$tmp}),"]\n" if (@fmt);
+ 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";