--- parser3/src/main/pa_table.C	2001/05/07 15:31:46	1.28
+++ parser3/src/main/pa_table.C	2001/11/05 11:46:29	1.40
@@ -2,10 +2,9 @@
 	Parser: table class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_table.C,v 1.28 2001/05/07 15:31:46 paf Exp $
+	$Id: pa_table.C,v 1.40 2001/11/05 11:46:29 paf Exp $
 */
 
 #include <stdlib.h>
@@ -16,7 +15,7 @@
 
 Table::Table(Pool& apool, 
 			 const String *aorigin_string,
-			 Array *acolumns, 
+			 const Array *acolumns, 
 			 int initial_rows) :
 	Array(apool, initial_rows),
 
@@ -32,16 +31,25 @@ Table::Table(Pool& apool,
 		}
 }
 
-int Table::column_name2index(const String& column_name) const {
-	if(fcolumns) // named
-		return name2number.get_int(column_name)-1; // -1 = column not found
-	else { // nameless
-		char *error_pos=0;
-		int result=(int)strtol(column_name.cstr(), &error_pos, 0);
-		if(error_pos && *error_pos)
-			THROW(0, 0,
+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 Exception(0, 0,
 				&column_name,
-				"invalid column number");
+				"column not found");
+		return result;
+	} else { // nameless
+		char *error_pos;
+		const char *cstr=column_name.cstr();
+		int result=(int)strtol(cstr, &error_pos, 0);
+		if(*error_pos/*not EOS*/) {
+			result=-1;
+			if(bark)
+				throw Exception(0, 0,
+					&column_name,
+					"invalid column number");
+		}
 		return result;
 	}
 }
@@ -56,23 +64,19 @@ const String *Table::item(int column) co
 }
 
 bool Table::locate(int column, const String& value) {
+	int scurrent=fcurrent;
 	for(fcurrent=0; fcurrent<size(); fcurrent++) {
 		const String *item_value=item(column);
 		if(item_value && *item_value==value)
 			return true;
 	}
 
-	fcurrent=0;
+	fcurrent=scurrent;
 	return false;
 }
 
 bool Table::locate(const String& column, const String& value) {
-	int index=column_name2index(column);
-	if(index<0)
-		THROW(0, 0,
-			&column,
-			"column not found (locate)");
-	return locate(index, value);
+	return locate(column_name2index(column, true), value);
 }
 
 void Table::shift(int offset) {