Fix mapper to work with current code
authorMarkus Armbruster <armbru@pond.sub.org>
Fri, 4 Jul 2008 21:31:33 +0000 (17:31 -0400)
committerMarkus Armbruster <armbru@pond.sub.org>
Fri, 4 Jul 2008 21:31:33 +0000 (17:31 -0400)
4.2.0 broke over.awk.

scripts/mapper/over.awk

index 46741a5834efcb297ef46d71c2f2cacb0776c8c9..8633d1ffc67ba2c99c0a55e61accf5112f6ffa5c 100644 (file)
@@ -8,13 +8,13 @@ BEGIN {
   FS="[ \t\n,]+";
 }
 
-/^World size is [0-9]+ by [0-9]+./ {
+/^World size is [0-9]+ by [0-9]+\./ {
   width = $4;
   height= $6;
   system("ppmmake white " (width+1)*scale " " height*scale " | ppmtopgm | pgmtopbm >over.pbm");
 }
 
-/.*#.*name.*tech.*research.*education.*happiness.*cap-location/ {
+/.*#.*name.*tech.*research.*education.*happiness.*capital/ {
   getline;
   while (NF>4) {
     if ($2>0 && $2<90) {