--- trunk/lib/WebPAC/Input.pm	2006/08/26 12:00:36	625
+++ trunk/lib/WebPAC/Input.pm	2006/09/06 18:08:30	634
@@ -294,8 +294,7 @@
 				$log->debug("-=> $f_nr ## $l");
 
 				# codepage conversion and recode_regex
-#				from_to($l, $code_page, $self->{'encoding'});
-				from_to($l, $code_page, 'utf-8');
+				from_to($l, $code_page, $self->{'encoding'});
 				$l =~ s/($recode_regex)/$recode_map->{$1}/g if ($recode_regex && $recode_map);
 
 				# apply regexps
@@ -303,8 +302,11 @@
 					$log->logconfess("regexps->{$f_nr} must be ARRAY") if (ref($rec_regex->{$f_nr}) ne 'ARRAY');
 					my $c = 0;
 					foreach my $r (@{ $rec_regex->{$f_nr} }) {
-						#$log->debug("\$l = $l\neval \$l =~ $r");
+						my $old_l = $l;
 						eval '$l =~ ' . $r;
+						if ($old_l ne $l) {
+							$log->debug("REGEX on $f_nr eval \$l =~ $r\n## old l: [$old_l]\n## new l: [$l]");
+						}
 						$log->error("error applying regex: $r") if ($@);
 					}
 				}
@@ -549,25 +551,29 @@
 
 	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]");
 				}
 
 			}