move logging to debug level

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@634 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/conf/log.conf b/conf/log.conf
index 686aef7..86abada 100644 (file)
--- a/conf/log.conf
+++ b/conf/log.conf
@@ -22,6 +22,7 @@ log4perl.rootLogger=INFO, LOG, SCREEN
 #log4perl.logger.WebPAC.Validate=DEBUG
 
 #log4perl.logger.WebPAC.Input=DEBUG
+log4perl.logger.WebPAC.Input.modify_record_regexps=DEBUG
 #log4perl.logger.WebPAC.Input.ISIS=DEBUG
 #log4perl.logger.WebPAC.Input.ISIS.fetch=DEBUG
 #log4perl.logger.WebPAC.Input.ISIS.open=DEBUG

diff --git a/lib/WebPAC/Input.pm b/lib/WebPAC/Input.pm
index 4a5aa47..d254dcd 100644 (file)
--- a/lib/WebPAC/Input.pm
+++ b/lib/WebPAC/Input.pm
@@ -551,25 +551,29 @@ sub modify_record_regexps {
 
        my $regexpes;
 
+       my $log = $self->_get_logger();
+
        foreach my $f (keys %$modify_record) {
-warn "--- f: $f\n";
+               $log->debug("field: $f");
+
                foreach my $sf (keys %{ $modify_record->{$f} }) {
-warn "---- sf: $sf\n";
+                       $log->debug("subfield: $sf");
+
                        foreach my $from (keys %{ $modify_record->{$f}->{$sf} }) {
                                my $to = $modify_record->{$f}->{$sf}->{$from};
                                #die "no field?" unless defined($to);
-warn "----- transform: |$from| -> |$to|\n";
+                               $log->debug("transform: |$from| -> |$to|");
 
                                if ($sf =~ /^\^/) {
                                        my $regex = 
-                                               's/\Q'. $sf .'\E([^\^]+)\Q'. $from .'\E([^\^]+)/'. $sf .'$1'. $to .'$2/g';
+                                               's/\Q'. $sf .'\E(.*?)\Q'. $from .'\E(.*?)/'. $sf .'$1'. $to .'$2/g';
                                        push @{ $regexpes->{$f} }, $regex;
-warn ">>>>> $regex [sf]\n";
+                                       $log->debug(">>>>> $regex [sf]");
                                } else {
                                        my $regex =
                                                's/\Q'. $from .'\E/'. $to .'/g';
                                        push @{ $regexpes->{$f} }, $regex;
-warn ">>>>> $regex [global]\n";
+                                       $log->debug(">>>>> $regex [global]");
                                }
 
                        }