X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=parse_format.pm;h=e348dded4a45b55cf7f95d6e72e1df78f07fdef9;hb=da4562f447dcd048e2f7d73b50038f0b8414572c;hp=b7c0e4734ef9feed78acf43d28f3e9be405617b8;hpb=89f439343fc889a8b9e7d283600b419225238835;p=webpac

diff --git a/parse_format.pm b/parse_format.pm
index b7c0e47..e348dde 100644
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -55,6 +55,9 @@ sub parse_iso_format {
 
 		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,24 +83,40 @@ sub parse_iso_format {
 			# 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) {
 				push @fmt,'mfn';
 				push @fmt,'';
 			} elsif ($f =~ s/^([^\d]+)(\d{0,3})/$2/) {
-				push @fmt,$1;
+				# still prefix?
+				if ($#fmt == 0) {
+					$fmt[0] .= $1;
+				} else {
+					push @fmt,$1;
+				}
 			} elsif ($f =~ s/^([^\d]+\d{0,2})//) {
-				push @fmt,$1;
+				if ($#fmt == 0) {
+					$fmt[0] .= $1;
+				} else {
+					push @fmt,$1;
+				}
 			} elsif ($f =~ s/^(\d{1,2})//) {
-				push @fmt,$1;
+				if ($#fmt == 0) {
+					$fmt[0] .= $1;
+				} else {
+					push @fmt,$1;
+				}
 			} else {
 				print STDERR "unparsed format: $f\n";
 				$f = "";
 			}
 		}
 		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";
@@ -138,9 +157,33 @@ sub parse_iso_format {
 		$sufix = shift @fmt;
 	}
 	$display = $prefix.$display.$sufix if ($display);
-	print STDERR "format left unused: [",join("|",@fmt),"]\n" if (@fmt);
 
-#	print STDERR "display: $display swish: $swish\n";
+	my $eval = $cache->{format_eval}->{$format};
+	if ($eval) {
+		sub fld2str {
+			my ($func,$row,$f,$sf,$i) = @_;
+#print STDERR "## in fld2str\n";
+			my $tmp = $codepage->convert(&$func($row,$f,$sf,$i)) ||  $codepage->convert(&$func($row,$f,$sf,0)) || '';
+			return "'$tmp'";
+		}
+
+		$eval =~ s/v(\d+)\^(\w*)/fld2str($func,$row,$1,$2,$i)/eg;
+#print STDERR "## eval: $eval\n";
+		if (eval "$eval") {
+			die "eval error: eval{$eval}: $@" if ($@);
+			return ($swish,$display);
+		} else {
+			die "eval error: eval{$eval}: $@" if ($@);
+			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";
 
 	return ($swish,$display);
 }
@@ -151,7 +194,14 @@ sub parse_excel_format {
 	my $format = shift;
 	my $row = shift;
 	my $i = shift;
-	my $codepage = shift;
+	#my $codepage = shift;
+	#
+	# data allready comes in utf-8 due to change in
+	# SpreadSheet::ParseExcel::FmtDefault line 69 from
+	#	return pack('C*', unpack('n*', $sTxt));
+	# to following which returns utf-8:
+	#	return pack('U*', unpack('n*', $sTxt));
+	#
 
 	return if ($i > 0);	# Excel doesn't support repeatable fields
 
@@ -172,9 +222,6 @@ sub parse_excel_format {
 #print STDERR "--$1-> $format -[",length($format),"] ";
 			if ($row->{$1}) {
 				my $tmp = $row->{$1};
-				if ($codepage) {
-					$tmp = $codepage->convert($tmp) || warn "excel: $1 '$tmp' can't convert";
-				}
 				$display .= $prefix . $tmp;
 				$swish .= $tmp." ";
 #print STDERR " == $tmp";
@@ -183,7 +230,7 @@ sub parse_excel_format {
 		} elsif ($format =~ s/^([^A-Z\|]+)(\|[A-Z]{1,2}\|)/$2/) {
 			$prefix .= $1 if ($display);
 		} else {
-			print STDERR "unparsed format: $format\n";
+			#print STDERR "unparsed format: $format\n";
 			$prefix .= $format;
 			$format = "";
 		}