another fix for repeatable fields

[webpac] / parse_format.pm

diff --git a/parse_format.pm b/parse_format.pm
index 464767f..ac4e9ab 100644 (file)
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -46,9 +46,10 @@ sub parse_iso_format {
        my $swish;
 
        sub cnv_cp {
-               my $tmp = shift;
+               my $codepage = shift;
+               my $tmp = shift || return;
                if ($codepage) {
-                       $tmp = $codepage->convert($tmp) || print STDERR "$1$2 = '$tmp' can't convert";
+                       $tmp = $codepage->convert($tmp) || print STDERR "iso: '$tmp' can't convert\n";
                }
                return $tmp;
        }
@@ -58,9 +59,9 @@ sub parse_iso_format {
                # this is EBSCO special to support numeric subfield in
                # form of 856#3
                if ($format =~ s/^(\d\d\d)#*(\w?)//) {
-                       my $tmp = get_sf($row,$1,$2,$i);
+                       my $tmp = cnv_cp($codepage,&$func($row,$1,$2,$i));
                        if ($tmp) {
-                               $display .= $prefix.cnv_cp($tmp);
+                               $display .= $prefix.$tmp;
                                $swish .= $tmp." ";
 #print STDERR " == $tmp";
                        }
@@ -69,9 +70,9 @@ sub parse_iso_format {
                # (as opposed to 010 and 011) so they are strictly listed
                # here
                } elsif ($format =~ s/^(1[01])//) {
-                       my $tmp = get_sf($row,$1,undef,$i);
+                       my $tmp = cnv_cp($codepage,&$func($row,$1,undef,$i));
                        if ($tmp) {
-                               $display .= $prefix.cnv_cp($tmp);
+                               $display .= $prefix.$tmp;
                                $swish .= $tmp." ";
                        }
                        $prefix = "";
@@ -104,6 +105,8 @@ sub parse_excel_format {
        my $i = shift;
        my $codepage = shift;
 
+       return if ($i > 0);     # Excel doesn't support repeatable fields
+
        my $out;
        my $out_swish;
 
@@ -152,6 +155,10 @@ sub parse_feed_format {
        my $i = shift;
        my $codepage = shift;
 
+       # XXX feed doesn't support repeatable fields, but they really
+       # should, This is a bug. It should be fixed!
+       return if ($i > 0);
+
        my $out;
        my $out_swish;