--- parser3/src/main/pa_table.C	2001/01/29 20:46:22	1.3
+++ parser3/src/main/pa_table.C	2001/05/08 08:14:56	1.29
@@ -1,64 +1,81 @@
-/*
-  $Id: pa_table.C,v 1.3 2001/01/29 20:46:22 paf Exp $
+/** @file
+	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.29 2001/05/08 08:14:56 paf Exp $
 */
 
 #include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
+#include "pa_exception.h"
 
-Table::Table(Request& arequest, 
-			 char *afile, uint aline, 
+Table::Table(Pool& apool, 
+			 const String *aorigin_string,
 			 Array *acolumns, 
 			 int initial_rows) :
-	Array(arequest.pool, initial_rows),
-	request(arequest),
-	current(0),
-	columns(acolumns), 
-	name2number(arequest.pool, false) {
-#ifndef NO_STRING_ORIGIN
-	origin.file=afile;
-	origin.line=aline;
-#endif
-
-	if(columns)
-		for(int i=0; i<columns->size(); i++) {
-			String name(pool);
-			name.APPEND(columns->get_cstr(i), 0, 0);
+	Array(apool, initial_rows),
+
+	forigin_string(aorigin_string),
+	fcurrent(0),
+	fcolumns(acolumns), 
+	name2number(pool()) {
+
+	if(fcolumns)
+		for(int i=0; i<fcolumns->size(); i++) {
+			const String& name=*fcolumns->get_string(i);
 			name2number.put(name, i+1);
 		}
 }
 
-const Array *Table::at(int index) {
-	if(index<0 || index>=size())
-		request.error.raise(0, 
-			"table column index %d is out of range [0..%d]", 
-			index, size()-1);
-	
-	return static_cast<const Array *>(get(index));
-}
-
-const char *Table::item(int index) {
-	const Array *row=at(current);
-	return row->get_cstr(index);
-}
-
-const char *Table::item(String column_name) {
-	int column_index;
-	if(columns) {
-		int found_index=name2number.get_int(column_name);
-		if(found_index)
-			column_index=found_index-1;
-		else
-			request.error.raise(&column_name, "column not found");
-	} else {
-		column_index=atoi(column_name.cstr());
-		const Array *row=at(current);
-		if(column_index<0 || column_index>=row->size())
-			request.error.raise(&column_name, 
-				"table column index %d is out of range [0..%d]", 
-				column_index, row->size()-1);
+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 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)
+			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>=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) {
+	for(fcurrent=0; fcurrent<size(); fcurrent++) {
+		const String *item_value=item(column);
+		if(item_value && *item_value==value)
+			return true;
+	}
+
+	fcurrent=0;
+	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();
 }