X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=parse_format.pm;h=e5b23a6ac0189fea9ff7b5762c8272b9cdf69ebe;hb=6209bea7c9ed99dacfbf229e709d1da3a26f6457;hp=ca25b06595342842c1f1d3d406903e1c7aa8f9cd;hpb=91330ff9f516f7ae67422a3d3d676a1e1f9a80a1;p=webpac

diff --git a/parse_format.pm b/parse_format.pm
index ca25b06..e5b23a6 100644
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -163,7 +163,7 @@ sub parse_iso_format {
 		sub fld2str {
 			my ($func,$row,$f,$sf,$i) = @_;
 #print STDERR "## in fld2str\n";
-			my $tmp = &$func($row,$f,$sf,$i) || '';
+			my $tmp = $codepage->convert(&$func($row,$f,$sf,$i)) || '';
 			return "'$tmp'";
 		}
 
@@ -224,7 +224,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 = "";
 		}