--- branches/lezbib/parse_format.pm	2004/09/21 16:53:44	458
+++ branches/lezbib/parse_format.pm	2005/02/28 10:43:38	684
@@ -10,13 +10,17 @@
 	my $i = shift || 0;	# isis repeatable number
 	my $codepage = shift || die "parse_format must be called with codepage!";
 	if ($type eq "isis") {
-		return parse_iso_format($format,$row,$i,$codepage,'isis_sf');
+		return parse_iso_format($format,$row,$i,$codepage,'hash_sf');
 	} elsif ($type eq "excel") {
 		return parse_excel_format($format,$row,$i,$codepage);
 	} elsif ($type eq "marc") {
 		return parse_iso_format($format,$row,$i,$codepage,'marc_sf');
 	} elsif ($type eq "feed") {
 		return parse_feed_format($format,$row,$i,$codepage);
+	} elsif ($type eq "dbf") {
+		return parse_iso_format($format,$row,$i,$codepage,'hash_sf');
+	} else {
+		confess "FATAL: unknown type '$type'";
 	}
 }
 
@@ -194,7 +198,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 +226,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";