--- trunk/all2xml.pl	2003/10/29 22:46:49	136
+++ trunk/all2xml.pl	2003/11/16 22:42:41	153
@@ -128,6 +128,32 @@
 			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);
@@ -160,9 +186,17 @@
 					}
 					if ($filter) {
 						no strict 'refs';
-						$display_data .= $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 {
-						$display_data .= $delimiter.$display;
+						if ($display_data) {
+							$display_data .= $delimiter.mkformat($x,$display);
+						} else {
+							$display_data = mkformat($x,$display);
+						}
 					}
 				}
 						
@@ -285,7 +319,7 @@
 	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;