--- parser3/src/main/pa_table.C	2001/03/27 13:47:31	1.20
+++ parser3/src/main/pa_table.C	2001/05/17 15:57:35	1.31
@@ -5,13 +5,14 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.C,v 1.20 2001/03/27 13:47:31 paf Exp $
+	$Id: pa_table.C,v 1.31 2001/05/17 15:57:35 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,
@@ -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,28 +32,54 @@ Table::Table(Pool& apool,
 		}
 }
 
-const Array &Table::at(int index) {
-	return *const_cast<const Array *>(static_cast<Array *>(get(index)));
-}
-
-const String *Table::item(const String& column_name) {
-	int column_index;
-	if(fcolumns) { // named
-		int found_index=name2number.get_int(column_name);
-		if(found_index)
-			column_index=found_index-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 result;
 	} else { // nameless
-		column_index=atoi(column_name.cstr());
-		if(!valid(fcurrent))
-			return 0; // it's OK we don't have row, just return nothing
+		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;
+	}
+}
+
+const String *Table::item(int column) const {
+	if(valid(fcurrent)) {
 		const Array& row=at(fcurrent);
-		if(column_index<0 || column_index>=row.size()) // read past proper index?
-			return 0; // it's OK we don't have column, just return nothing
+		if(column>=0 && column<row.size()) // proper index?
+			return row.get_string(column);
 	}
+	return 0; // it's OK we don't have row|column, just return nothing
+}
+
+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=scurrent;
+	return false;
+}
+
+bool Table::locate(const String& column, const String& value) {
+	return locate(column_name2index(column, true), value);
+}
 
-	return item(column_index);
+void Table::shift(int offset) {
+	if(size())
+		fcurrent=(fcurrent+offset+size())%size();
 }