better documentation, allmost useful :-)

[webpac] / parse_format.pm

diff --git a/parse_format.pm b/parse_format.pm
index ef2b96f..ac4e9ab 100644 (file)
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -16,6 +16,8 @@ sub parse_format {
                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);
        }
 }
 
@@ -44,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;
        }
@@ -56,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";
                        }
@@ -67,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 = "";
@@ -102,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;
 
@@ -142,4 +147,58 @@ sub parse_excel_format {
        return ($swish,$display);
 }
 
+#-------------------------------------------------------------
+
+sub parse_feed_format {
+       my $format = shift;
+       my $data = shift;
+       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;
+
+       my $prefix = "";
+       if ($format =~ s/^([^\d\|]{1,3})//) {
+               $prefix = $1;
+       }
+
+       my $display;
+       my $swish;
+
+       while ($format && length($format) > 0) {
+#print STDERR "\n#### $format #";
+               if ($format =~ s/^\|(\d+)\|//) {
+#print STDERR "--$1-> $format -[",length($format),"] ";
+                       if ($data->{$1}) {
+                               my $tmp = $data->{$1};
+                               if ($codepage) {
+                                       $tmp = $codepage->convert($tmp) || warn "feed: $1 '$tmp' can't convert\n";
+                               }
+                               $display .= $prefix . $tmp;
+                               $swish .= $tmp." ";
+#print STDERR " == $tmp";
+                       }
+                       $prefix = "";
+               } elsif ($format =~ s/^([^\d\|]+)(\|\d+\|)/$2/) {
+                       $prefix .= $1 if ($display);
+               } else {
+                       print STDERR "unparsed format: $format\n";
+                       $prefix .= $format;
+                       $format = "";
+               }
+#print STDERR " display: $display swish: $swish [format: $format]";
+       }
+       # add suffix
+       $display .= $prefix if ($display);
+
+       return ($swish,$display);
+}
+
+#-------------------------------------------------------------
+
 1;