fix warning

[webpac2] / lib / WebPAC / Input.pm

diff --git a/lib/WebPAC/Input.pm b/lib/WebPAC/Input.pm
index bbef001..45b3779 100644 (file)
--- a/lib/WebPAC/Input.pm
+++ b/lib/WebPAC/Input.pm
@@ -282,10 +282,13 @@ sub open {
                $log->debug("position: $pos\n");
 
                my $rec = $ll_db->fetch_rec($pos, sub {
-                               my ($l,$f_nr) = @_;
+                               my ($l,$f_nr,$debug) = @_;
 #                              return unless defined($l);
 #                              return $l unless ($rec_regex && $f_nr);
 
+                               return unless ( defined($l) && defined($f_nr) );
+
+                               warn "-=> $f_nr ## |$l|\n" if ($debug);
                                $log->debug("-=> $f_nr ## $l");
 
                                # codepage conversion and recode_regex
@@ -298,15 +301,22 @@ sub open {
                                        my $c = 0;
                                        foreach my $r (@{ $rec_regex->{$f_nr} }) {
                                                my $old_l = $l;
-                                               eval '$l =~ ' . $r;
+                                               $log->logconfess("expected regex in ", dump( $r )) unless defined($r->{regex});
+                                               eval '$l =~ ' . $r->{regex};
                                                if ($old_l ne $l) {
-                                                       $log->debug("REGEX on $f_nr eval \$l =~ $r\n## old l: [$old_l]\n## new l: [$l]");
+                                                       my $d = "|$old_l| -> |$l| "; # . $r->{regex};
+                                                       $d .= ' +' . $r->{line} . ' ' . $r->{file} if defined($r->{line});
+                                                       $d .= ' ' . $r->{debug} if defined($r->{debug});
+                                                       $log->debug("MODIFY $d");
+                                                       warn "*** $d\n" if ($debug);
+
                                                }
                                                $log->error("error applying regex: $r") if ($@);
                                        }
                                }
 
-                               $log->debug("<=- $f_nr ## $l");
+                               $log->debug("<=- $f_nr ## |$l|");
+                               warn "<=- $f_nr ## $l\n" if ($debug);
                                return $l;
                });
 
@@ -473,7 +483,7 @@ sub seek {
 
        my $log = $self->_get_logger();
 
-       $log->confess("called without pos") unless defined($pos);
+       $log->logconfess("called without pos") unless defined($pos);
 
        if ($pos < 1) {
                $log->warn("seek before first record");
@@ -557,7 +567,7 @@ sub dump_ascii {
 
 =head2 modify_record_regexps
 
-Generate hash with regexpes to be applied using l<filter>.
+Generate hash with regexpes to be applied using L<filter>.
 
   my $regexpes = $input->modify_record_regexps(
                900 => { '^a' => { ' : ' => '^b' } },
@@ -568,6 +578,11 @@ Generate hash with regexpes to be applied using l<filter>.
 
 sub _get_regex {
        my ($sf,$from,$to) = @_;
+
+       # protect /
+       $from =~ s!/!\\/!gs;
+       $to =~ s!/!\\/!gs;
+
        if ($from =~ m/^regex:(.+)$/) {
                $from = $1;
        } else {
@@ -599,10 +614,11 @@ sub modify_record_regexps {
                        foreach my $from (keys %{ $modify_record->{$f}->{$sf} }) {
                                my $to = $modify_record->{$f}->{$sf}->{$from};
                                #die "no field?" unless defined($to);
-                               $log->debug("transform: |$from| -> |$to|");
+                               my $d = "|$from| -> |$to|";
+                               $log->debug("transform: $d");
 
                                my $regex = _get_regex($sf,$from,$to);
-                               push @{ $regexpes->{$f} }, $regex;
+                               push @{ $regexpes->{$f} }, { regex => $regex, debug => $d };
                                $log->debug("regex: $regex");
                        }
                }
@@ -613,7 +629,7 @@ sub modify_record_regexps {
 
 =head2 modify_file_regexps
 
-Generate hash with regexpes to be applied using l<filter> from
+Generate hash with regexpes to be applied using L<filter> from
 pseudo hash/yaml format for regex mappings.
 
 It should be obvious:
@@ -663,7 +679,11 @@ sub modify_file_regexps {
                        $log->debug("transform: |$from| -> |$to|");
 
                        my $regex = _get_regex($sf,$from,$to);
-                       push @{ $regexpes->{$f} }, $regex;
+                       push @{ $regexpes->{$f} }, {
+                               regex => $regex,
+                               file => $modify_path,
+                               line => $.,
+                       };
                        $log->debug("regex: $regex");
                }
        }