--- trunk/t/2_isis.t	2006/07/10 12:01:04	62
+++ trunk/t/2_isis.t	2006/07/13 09:13:25	63
@@ -281,15 +281,19 @@
 		'^b901b-2 x 901b-2',
 		'^c901c-3 y 901c-3',
 	],
+	902 => [
+		'^a902a-1^b9002a-2',
+	],
 };
 
 my $split_on_delimiters = {
-	900 => { a => { ' : ' => 'b', ' ; ' => 'c' } },
+	900 => { '^a' => { ' : ' => '^b', ' ; ' => '^c' } },
 	901 => { 
-		a => { ' x ' => 'b', ' y ' => 'c' },
-		b => { ' x ' => 'b' },
-		c => { ' y ' => 'c' }
+		'^a' => { ' x ' => '^b', ' y ' => '^c' },
+		'^b' => { ' x ' => '^b' },
+		'^c' => { ' y ' => '^c' }
 	},
+	902 => { '*' => { '^b' => ' * ' } },
 };
 
 diag "split_on_delimiters = ", Dumper($split_on_delimiters);
@@ -300,15 +304,23 @@
 warn "--- f: $f\n";
 	foreach my $sf (keys %{ $split_on_delimiters->{$f} }) {
 warn "---- sf: $sf\n";
-		foreach my $patt (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
-			my $new_sf = $split_on_delimiters->{$f}->{$sf}->{$patt} || die "no field?";
-warn "----- patt: $patt -> $new_sf\n";
-
-			# fool-proof spaces in pattern
-			$patt =~ s/\s+/\\s\+/g;
-	
-			push @{ $regexpes->{$f} },
-		's/\^' . $sf . '([^\^]+)' . $patt . '([^\^]+)/^' . $sf . '$1^' . $new_sf . '$2/g';
+		foreach my $from (keys %{ $split_on_delimiters->{$f}->{$sf} }) {
+			my $to = $split_on_delimiters->{$f}->{$sf}->{$from};
+			#die "no field?" unless defined($to);
+warn "----- transform: |$from| -> |$to|\n";
+
+			if ($sf =~ /^\^/) {
+				my $regex = 
+					's/\Q'. $sf .'\E([^\^]+)\Q'. $from .'\E([^\^]+)/'. $sf .'$1'. $to .'$2/g';
+				push @{ $regexpes->{$f} }, $regex;
+warn ">>>>> $regex [sf]\n";
+			} else {
+				my $regex =
+					's/\Q'. $from .'\E/'. $to .'/g';
+				push @{ $regexpes->{$f} }, $regex;
+warn ">>>>> $regex [global]\n";
+			}
+
 		}
 	}
 }
@@ -325,6 +337,7 @@
               { b => ["901b-2", "901b-2"] },
               { c => ["901c-3", "901c-3"] },
             ],
+   902   => [{ a => "902a-1 * 9002a-2" }],
 }, 'hash is_deeply');
 
 ok($isis->{regexpes} = $regexpes, 'isis->{regexpes}');