--- parser3/src/main/pa_table.C	2001/05/07 08:29:45	1.27
+++ parser3/src/main/pa_table.C	2001/05/08 12:58:00	1.30
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.C,v 1.27 2001/05/07 08:29:45 paf Exp $
+	$Id: pa_table.C,v 1.30 2001/05/08 12:58:00 paf Exp $
 */
 
 #include <stdlib.h>
@@ -32,16 +32,24 @@ 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)
+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,
-				"invalid column number");
+				"column not found");
+		return result;
+	} else { // nameless
+		char *error_pos=0;
+		int result=(int)strtol(column_name.cstr(), &error_pos, 0);
+		if(error_pos && *error_pos) {
+			result=-1;
+			if(bark)
+				THROW(0, 0,
+					&column_name,
+					"invalid column number");
+		}
 		return result;
 	}
 }
@@ -66,6 +74,10 @@ bool Table::locate(int column, const Str
 	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();