--- parser3/src/main/pa_table.C	2001/03/12 12:00:06	1.12
+++ parser3/src/main/pa_table.C	2001/11/05 11:46:29	1.40
@@ -1,28 +1,28 @@
-/*
-	Parser
+/** @file
+	Parser: table class.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_table.C,v 1.12 2001/03/12 12:00:06 paf Exp $
+	$Id: pa_table.C,v 1.40 2001/11/05 11:46:29 paf Exp $
 */
 
 #include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
+#include "pa_exception.h"
 
 Table::Table(Pool& apool, 
-			 char *afile, uint aline, 
-			 Array *acolumns, 
+			 const String *aorigin_string,
+			 const Array *acolumns, 
 			 int initial_rows) :
 	Array(apool, initial_rows),
+
+	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool(), false) {
-#ifndef NO_STRING_ORIGIN
-	forigin.file=afile;
-	forigin.line=aline;
-#endif
+	name2number(pool()) {
 
 	if(fcolumns)
 		for(int i=0; i<fcolumns->size(); i++) {
@@ -31,32 +31,55 @@ Table::Table(Pool& apool,
 		}
 }
 
-const Array &Table::at(int index) {
-	if(index<0 || index>=size())
-		THROW(0, 0, 
-			0,
-			"table row index %d is out of range [0..%d]", 
-			index, size()-1);
-	
-	return *static_cast<const 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
-			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 result;
 	} else { // nameless
-		column_index=atoi(column_name.cstr());
+		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;
+	}
+}
+
+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, 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();
 }