--- trunk/lib/WebPAC/Input.pm	2007/02/04 15:09:01	799
+++ trunk/lib/WebPAC/Input.pm	2007/02/04 23:10:18	800
@@ -286,7 +286,7 @@
 #				return unless defined($l);
 #				return $l unless ($rec_regex && $f_nr);
 
-				warn "-=> $f_nr ## $l\n" if ($debug);
+				warn "-=> $f_nr ## |$l|\n" if ($debug);
 				$log->debug("-=> $f_nr ## $l");
 
 				# codepage conversion and recode_regex
@@ -299,16 +299,21 @@
 					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]");
-							warn "*** $r |$old_l| -> |$l|\n" if ($debug);
+							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;
 		});
@@ -607,10 +612,11 @@
 			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");
 			}
 		}
@@ -671,7 +677,11 @@
 			$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");
 		}
 	}