supprot \x42 HEX numbers in recode

[webpac2] / lib / WebPAC / Input.pm

diff --git a/lib/WebPAC/Input.pm b/lib/WebPAC/Input.pm
index ecc6773..462a303 100644 (file)
--- a/lib/WebPAC/Input.pm
+++ b/lib/WebPAC/Input.pm
@@ -182,9 +182,7 @@ sub open {
        my $input_encoding = $arg->{'input_encoding'} || $self->{'input_encoding'} || 'cp852';
 
        # store data in object
-       foreach my $v (qw/path offset limit/) {
-               $self->{$v} = $arg->{$v} if defined $arg->{$v};
-       }
+       $self->{$_} = $arg->{$_} foreach grep { defined $arg->{$_} } qw(path offset limit);
 
        if ($arg->{load_row} || $arg->{save_row}) {
                $log->logconfess("save_row and load_row must be defined in pair and be CODE") unless (
@@ -208,6 +206,7 @@ sub open {
                        while (@r) {
                                my $from = shift @r;
                                my $to = shift @r;
+                               $from =~ s/^\\x([0-9a-f]{2})/chr(hex($1))/eig;
                                $recode_map->{$from} = $to;
                        }
 
@@ -276,21 +275,22 @@ sub open {
                $to_rec = $size if ($to_rec > $size);
        }
 
-       # store size for later
-       $self->{size} = $to_rec - $from_rec + 1;
-
        my $strict_encoding = $arg->{strict_encoding} || $self->{strict_encoding}; ## FIXME should be 1 really
 
-       $log->info("processing $self->{size}/$size records [$from_rec-$to_rec]",
+       $log->info("processing ", $self->{size} || 'all', "/$size records [$from_rec-$to_rec]",
                " encoding $input_encoding ", $strict_encoding ? ' [strict]' : '',
                $self->{stats} ? ' [stats]' : '',
        );
 
+       $self->{size} = 0;
+
        # read database
        for (my $pos = $from_rec; $pos <= $to_rec; $pos++) {
 
                $log->debug("position: $pos\n");
 
+               $self->{size}++; # XXX I could move this more down if I didn't want empty records...
+
                my $rec = $ll_db->fetch_rec($pos, sub {
                                my ($l,$f_nr,$debug) = @_;
 #                              return unless defined($l);
@@ -298,6 +298,8 @@ sub open {
 
                                return unless ( defined($l) && defined($f_nr) );
 
+                               my $marc_subfields = $l =~ s/\x1F(\w)/\^$1/g; # fix MARC subfiled delimiters to ^
+
                                warn "-=> $f_nr ## |$l|\n" if ($debug);
                                $log->debug("-=> $f_nr ## $l");
 
@@ -325,6 +327,8 @@ sub open {
                                        }
                                }
 
+                               $l =~ s/\^(\w)/\x1F$1/g if $marc_subfields;
+
                                $log->debug("<=- $f_nr ## |$l|");
                                warn "<=- $f_nr ## $l\n" if ($debug);
                                return $l;
@@ -473,7 +477,7 @@ because it takes into account C<offset> and C<limit>.
 
 sub size {
        my $self = shift;
-       return $self->{size};
+       return $self->{size}; # FIXME this is buggy if open is called multiple times!
 }
 
 =head2 seek