ported 257:258 from hidra branch

[webpac] / parse_format.pm

diff --git a/parse_format.pm b/parse_format.pm
index 7274447..9123832 100644 (file)
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -80,7 +80,7 @@ sub parse_iso_format {
                        # this might be our local scpeciality -- fields 10 and 11
                        # (as opposed to 010 and 011) so they are strictly listed
                        # here
-                       } elsif ($f =~ s/^(1[01])//) {
+                       } elsif ($f =~ s/^(1[01]\w?)//) {
                                push @fmt,$1;
                                push @fmt,undef;
                        } elsif ($f =~ s/^mfn//i) {
@@ -113,7 +113,7 @@ sub parse_iso_format {
                push @fmt,'' if ($#fmt % 3 != 0);       # add empty suffix
                $cache->{format}->{$format} = \@fmt;
                
-               print STDERR "storing format for '$format': [",join("|",@fmt),"]\n";
+#              print STDERR "storing format for '$format': [",join("|",@fmt),"]\n";
 #              print STDERR "storing format for '$format':",Dumper(@fmt),"\n";
 #              print STDERR Dumper($cache->{format}->{$format});
        }
@@ -155,7 +155,7 @@ sub parse_iso_format {
 
        print STDERR "format: [",join("|",@{$tmp}),"]\n" if (@fmt);
 
-#      print STDERR "display: $display swish: $swish\n";
+#      print STDERR "format: {",$format || '',"} display: {",$display || '',"} swish: {",$swish || '',"}\n";
 
        return ($swish,$display);
 }