my @index_data;
my $index_filter;
+ sub mkformat {
+ my $x = shift || die "mkformat needs tag reference";
+ my $data = shift || return;
+ 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 ($format_delimiter) {
+ @data = split(/$format_delimiter/,$data);
+ } else {
+ push @data,$data;
+ }
+
+ if ($fmt) {
+ my $nr = scalar $fmt =~ s/%s/%s/g;
+ if (($#data+1) == $nr) {
+ return sprintf($fmt,@data);
+ } else {
+ print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
+ return $data;
+ }
+ } else {
+ print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
+ }
+ }
+
# while because of repeatable fields
while ($swish || $display) {
($swish,$display) = parse_format($type, $format,$row,$repeat_off++,$import2cp);
}
if ($filter) {
no strict 'refs';
- $display_data .= join($delimiter,&$filter($display));
+ if ($display_data) {
+ $display_data .= $delimiter.join($delimiter,mkformat($x,&$filter($display)));
+ } else {
+ $display_data = join($delimiter,mkformat($x,&$filter($display)));
+ }
} else {
if ($display_data) {
- $display_data .= $delimiter.$display;
+ $display_data .= $delimiter.mkformat($x,$display);
} else {
- $display_data .= $display;
+ $display_data = mkformat($x,$display);
}
}
}
if (@index_data) {
if ($index_filter) {
no strict 'refs';
- foreach my $d (&$index_filter(@index_data)) {
- $index->insert($field, $d, $path);
+ foreach my $d (@index_data) {
+ $index->insert($field, &$index_filter($d), $path);
}
} else {
foreach my $d (@index_data) {
my $type_base = $type;
$type_base =~ s/_.+$//g;
- $config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config' ], forcecontent => 1);
+ $config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config', 'format' ], forcecontent => 1);
# output current progress indicator
my $last_p = 0;