# placeholder for all repeatable entries for index
- sub chk_eval($) {
- my $data = shift;
- if ($data =~ s/eval{([^}]+)}//) {
- 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";
$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;
}
}
# type="swish" ; field for swish
if ($swish) {
+ my $tmp = $swish;
if ($filter && ($s || $se)) {
no strict 'refs';
- my $tmp = join(" ",&$filter($swish)) if ($s || $se);
- $swish_data .= $tmp if ($s);
- $swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
-
- } else {
- $swish_data .= $swish if ($s);
- $swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
+ $tmp = join(" ",&$filter($tmp)) if ($s || $se);
}
+
+ $swish_data .= $tmp if ($s && $tmp);
+ $swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
}
# type="display" ; field for display
no strict 'refs';
$idisplay = &$filter($idisplay);
}
- push @index_data, $idisplay if (! $iterate_by_page);
+ push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
}
# store fields in lookup
if ($lookup_key) {
print STDERR "WARNING: try to redefine lookup_key (keys shouldn't be repeatable fields!)";
} else {
- $lookup_key = $display;
+ if ($filter) {
+ no strict 'refs';
+ $lookup_key = &$filter($display);
+ } else {
+ $lookup_key = $display;
+ }
}
} elsif (lc($x->{type}) eq "lookup_val") {
if ($lookup_key) {
- $lhash{$lookup_key} = $display;
+ if ($filter) {
+ no strict 'refs';
+ $lhash{$lookup_key} = &$filter($display);
+ } else {
+ $lhash{$lookup_key} = $display;
+ }
} else {
print STDERR "WARNING: no lookup_key defined for '$display'?";
}
print STDERR "\n";
} elsif ($type_base eq "excel") {
- use Spreadsheet::ParseExcel;
- use Spreadsheet::ParseExcel::Utility qw(int2col);
+ require Spreadsheet::ParseExcel;
+ require Spreadsheet::ParseExcel::Utility;
+ import Spreadsheet::ParseExcel::Utility qw(int2col);
$import2cp = Text::Iconv->new($config->{excel_codepage},$codepage);
my $excel_file = $cfg -> val($database, 'excel_file') || die "$database doesn't have 'excel_file' defined!";
}
} elsif ($type_base eq "marc") {
- use MARC;
+ require MARC;
$import2cp = Text::Iconv->new($config->{marc_codepage},$codepage);
my $marc_file = $cfg -> val($database, 'marc_file') || die "$database doesn't have 'marc_file' defined!";