--- parser3/src/main/pa_table.C	2001/03/28 09:01:22	1.22
+++ parser3/src/main/pa_table.C	2001/05/08 08:14:56	1.29
@@ -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.29 2001/05/08 08:14:56 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,
@@ -22,7 +23,7 @@ Table::Table(Pool& apool,
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool(), false) {
+	name2number(pool()) {
 
 	if(fcolumns)
 		for(int i=0; i<fcolumns->size(); i++) {
@@ -31,19 +32,23 @@ Table::Table(Pool& apool,
 		}
 }
 
-int Table::column_name2index(const String& column_name) const {
-	if(fcolumns) { // named
-		int column_number=name2number.get_int(column_name);
-		if(column_number)
-			return column_number-1;
-		else {
+int Table::column_name2index(const String& column_name, bool bark) const {
+	if(fcolumns) {// named
+		int result=name2number.get_int(column_name)-1; // -1 = column not found
+		if(bark && result<0)
 			THROW(0, 0,
-				&column_name, 
+				&column_name,
 				"column not found");
-			return 0; // unreached
-		}
-	} else // nameless
-		return atoi(column_name.cstr());
+		return result;
+	} 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 +60,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;
 	}
@@ -67,6 +71,10 @@ bool Table::locate(const String& column,
 	return false;
 }
 
+bool Table::locate(const String& column, const String& value) {
+	return locate(column_name2index(column, true), value);
+}
+
 void Table::shift(int offset) {
 	if(size())
 		fcurrent=(fcurrent+offset+size())%size();