--- trunk/parse_format.pm	2003/11/24 01:16:04	176
+++ branches/humanistika/parse_format.pm	2004/03/12 16:02:06	267
@@ -55,6 +55,9 @@
 
 		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;
@@ -80,7 +83,7 @@
 			# 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) {
@@ -111,9 +114,12 @@
 			}
 		}
 		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";
+#		print STDERR "storing format for '$format': [",join("|",@fmt),"]\n";
 #		print STDERR "storing format for '$format':",Dumper(@fmt),"\n";
 #		print STDERR Dumper($cache->{format}->{$format});
 	}
@@ -151,11 +157,31 @@
 		$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 "display: $display swish: $swish\n";
+#	print STDERR "format: {",$format || '',"} display: {",$display || '',"} swish: {",$swish || '',"}\n";
 
 	return ($swish,$display);
 }