forgot to account for fullstop in pattern
authorChristopher Hall <chris.hall@catalyst.net.nz>
Tue, 7 Dec 2010 01:32:27 +0000 (14:32 +1300)
committerChristopher Hall <chris.hall@catalyst.net.nz>
Tue, 7 Dec 2010 01:32:27 +0000 (14:32 +1300)
installer/html-template-to-template-toolkit.pl

index 7cc2dbe..6f3b53e 100755 (executable)
@@ -155,11 +155,11 @@ foreach my $file (@template_files) {
     $input_tmpl =~ s/\seq\s/ == /ig;
     $input_tmpl =~ s/HTML/html/ig;
     $input_tmpl =~ s/URL/url/ig;
-    $input_tmpl =~ s/\w*__first__/loop.first/ig;
-    $input_tmpl =~ s/\w*__last__/loop.last/ig;
-    $input_tmpl =~ s/\w*__odd__/loop.odd/ig;
-    $input_tmpl =~ s/\w*__even__/loop.even/ig;
-    $input_tmpl =~ s/\w*__counter__/loop.count/ig; #loop.count gives the range (0..max) whereas loop.index gives the range (1..max+1), __counter__ is unknown
+    $input_tmpl =~ s/\w*\.__first__/loop.first/ig;
+    $input_tmpl =~ s/\w*\.__last__/loop.last/ig;
+    $input_tmpl =~ s/\w*\.__odd__/loop.odd/ig;
+    $input_tmpl =~ s/\w*\.__even__/loop.even/ig;
+    $input_tmpl =~ s/\w*\.__counter__/loop.count/ig; #loop.count gives the range (0..max) whereas loop.index gives the range (1..max+1), __counter__ is unknown
 
     #hack to get around lack of javascript filter
     $input_tmpl =~ s/\|JS/|replace("'", "\\'") |replace('"', '\\"') |replace('\\n', '\\\\n') |replace('\\r', '\\\\r')/ig;