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'";
}
}
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
sub fld2str {
my ($func,$row,$f,$sf,$i) = @_;
#print STDERR "## in fld2str\n";
- my $tmp = $codepage->convert(&$func($row,$f,$sf,$i)) || '';
+ 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);
}
}
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
#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";
} 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 = "";
}