changeset 123:e97f6db77197 misc

Updates.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 19 Dec 2010 22:12:03 +0000
parents f1cbbb262047
children 42e93bce0e34
files materials/csv2phpsql.pl materials/csv2transtab.pl
diffstat 2 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/materials/csv2phpsql.pl	Sun Dec 19 21:55:11 2010 +0000
+++ b/materials/csv2phpsql.pl	Sun Dec 19 22:12:03 2010 +0000
@@ -148,20 +148,20 @@
     "Nest" => 9,
     "Stack" => 10,
     "Mound" => 11,
-    "Puddle" => 12,
-    "Slab" => 13,
-    "Network" => 14,
-    "Pool" => 15,
-    "Hill" => 16,
-    "Mass" => 17,
-    "Tangle" => 18,
-    "Graveyard" => 19,
-    "Lump" => 20,
-    "Coil" => 21,
-    "Abyss" => 22,
-    "Pile" => 23,
-    "Torrent" => 24,
-    "Chunky" => 25,
+    "Chunky" => 12,
+    "Puddle" => 13,
+    "Slab" => 14,
+    "Network" => 15,
+    "Pool" => 16,
+    "Hill" => 17,
+    "Mass" => 18,
+    "Tangle" => 19,
+    "Graveyard" => 20,
+    "Lump" => 21,
+    "Coil" => 22,
+    "Abyss" => 23,
+    "Pile" => 24,
+    "Torrent" => 25,
   },
   19 => {
     "heap" => 0,
@@ -175,7 +175,7 @@
     "wisp" => 8,
     "wad" => 9,
     "clump" => 10,
-    "carcas" => 11,
+    "carcass" => 11,
     "gob" => 12,
     "strip" => 13,
     "dough" => 14,
@@ -213,7 +213,7 @@
     "formed" => 0,
     "stick" => 1,
     "bundle" => 2,
-    "elipsoid" => 3,
+    "ellipsoid" => 3,
     "pocket" => 4,
     "brick" => 5,
     "mold" => 6,
--- a/materials/csv2transtab.pl	Sun Dec 19 21:55:11 2010 +0000
+++ b/materials/csv2transtab.pl	Sun Dec 19 22:12:03 2010 +0000
@@ -4,7 +4,7 @@
 my %data = ();
 while (<STDIN>) {
   chomp;
-  if (/^([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z -]+);([a-z ]+);([a-zA-Z ]+);(Yes|No);([A-Z][a-z]+);([a-z, ]+);([a-z, ]+)$/) {
+  if (/^([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z ]+);([a-z -]+);([a-z ]+);([a-zA-Z ]+);(Yes|No);([A-Z][a-z]+);([a-z, ]+);([a-z, ]+);$/) {
     for (my $i = 2; $i <= 18; $i++) {
       $data{$i}{$$i}=1;
     }