Index: trunk/Ohana/src/libautocode/generate
===================================================================
--- trunk/Ohana/src/libautocode/generate	(revision 4023)
+++ trunk/Ohana/src/libautocode/generate	(revision 5014)
@@ -35,10 +35,16 @@
 	($key, $value) = split (" ", $line, 2);
 	
+	# strip white space from the following
+	if ($key eq "TYPE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+	if ($key eq "SIZE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+	if ($key eq "STRUCT")  { ($value) = $value =~ m|\s*(\S+)\s*|; }
+	if ($key eq "EXTNAME") { ($value) = $value =~ m|\s*(\S+)\s*|; }
+
 	&set_keypair ($key, $value);
 
 	# there are used internally (not just a replacement)
-	if ($key eq "TYPE")   { $TYPE = $value;   }
-	if ($key eq "SIZE")   { $SIZE = $value;   }
-	if ($key eq "STRUCT") { $STRUCT = $value; }
+	if ($key eq "TYPE")    { $TYPE = $value;   }
+	if ($key eq "SIZE")    { $SIZE = $value;   }
+	if ($key eq "STRUCT")  { $STRUCT = $value; }
 
 	# not a simple key/value entry
@@ -54,6 +60,8 @@
 	}
     }
+    $Nexpect = 0;
     if ($TYPE eq "BINTABLE") { $Nexpect = &count_bintablesize; }
     if ($TYPE eq "TABLE")    { $Nexpect = &count_tablesize;    }
+    if (! $Nexpect) { die "missing valid TYPE\n"; }
     if ($Nexpect != $SIZE) { die "size mismatch: $Nexpect vs $SIZE\n"; }
 }