--- parser3/src/main/pa_table.C	2001/03/28 09:01:22	1.22
+++ parser3/src/main/pa_table.C	2001/04/04 10:50:36	1.25
@@ -5,13 +5,14 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.C,v 1.22 2001/03/28 09:01:22 paf Exp $
+	$Id: pa_table.C,v 1.25 2001/04/04 10:50:36 paf Exp $
 */
 
 #include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
+#include "pa_exception.h"
 
 Table::Table(Pool& apool, 
 			 const String *aorigin_string,
@@ -42,8 +43,15 @@ int Table::column_name2index(const Strin
 				"column not found");
 			return 0; // unreached
 		}
-	} else // nameless
-		return atoi(column_name.cstr());
+	} else { // nameless
+		char *error_pos=0;
+		int result=(int)strtol(column_name.cstr(), &error_pos, 0);
+		if(error_pos && *error_pos)
+			THROW(0, 0,
+				&column_name,
+				"invalid column number");
+		return result;
+	}
 }
 
 const String *Table::item(int column) const {
@@ -55,10 +63,9 @@ const String *Table::item(int column) co
 	return 0; // it's OK we don't have row|column, just return nothing
 }
 
-bool Table::locate(const String& column, const String& value) {
-	int key_index=column_name2index(column);
+bool Table::locate(int column, const String& value) {
 	for(fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(key_index);
+		const String *item_value=item(column);
 		if(item_value && *item_value==value)
 			return true;
 	}