--- parser3/src/main/pa_table.C	2001/03/28 14:07:17	1.23
+++ parser3/src/main/pa_table.C	2001/10/19 12:43:30	1.39
@@ -2,27 +2,27 @@
 	Parser: table class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.C,v 1.23 2001/03/28 14:07:17 paf Exp $
+	$Id: pa_table.C,v 1.39 2001/10/19 12:43:30 parser Exp $
 */
 
 #include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
+#include "pa_exception.h"
 
 Table::Table(Pool& apool, 
 			 const String *aorigin_string,
-			 Array *acolumns, 
+			 const Array *acolumns, 
 			 int initial_rows) :
 	Array(apool, initial_rows),
 
 	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 +31,27 @@ 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 {
-			THROW(0, 0,
-				&column_name, 
+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,
 				"column not found");
-			return 0; // unreached
+		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");
 		}
-	} else // nameless
-		return atoi(column_name.cstr());
+		return result;
+	}
 }
 
 const String *Table::item(int column) const {
@@ -56,16 +64,21 @@ 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) {
+	return locate(column_name2index(column, true), value);
+}
+
 void Table::shift(int offset) {
 	if(size())
 		fcurrent=(fcurrent+offset+size())%size();