--- branches/hidra/parse_format.pm	2004/07/07 17:35:30	382
+++ branches/hidra/parse_format.pm	2004/09/29 18:56:26	489
@@ -56,7 +56,7 @@
 		my $f = $format;
 
 		my $eval;
-		$eval = $1 if ($f =~ s/^eval{([^}]+)}//);
+		$eval = $1 if ($f =~ s/^eval{([^}]+?)}//);
 
 		if ($f =~ s/^([^\d]+)//) {
 			if ($f) {	# there is more to parse
@@ -194,7 +194,14 @@
 	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
 
@@ -215,9 +222,6 @@
 #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";