--- parser3/src/main/pa_table.C	2001/03/10 16:34:39	1.10
+++ parser3/src/main/pa_table.C	2003/03/26 18:52:50	1.53.2.10.2.3
@@ -1,75 +1,81 @@
-/*
-	Parser
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>
+/** @file
+	Parser: table class.
 
-	$Id: pa_table.C,v 1.10 2001/03/10 16:34:39 paf Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include <stdlib.h>
+static const char* IDENT_TABLE_C="$Date: 2003/03/26 18:52:50 $";
 
 #include "pa_table.h"
-#include "pa_pool.h"
 
-Table::Table(Request& arequest, 
-			 char *afile, uint aline, 
-			 Array *acolumns, 
-			 int initial_rows) :
-	Array(arequest.pool(), initial_rows),
-	request(arequest),
+#include "pa_exception.h"
+
+Table::Table(columns_type acolumns, int initial_rows):
+	Array<element_type>(initial_rows),
+
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(arequest.pool(), false) {
-#ifndef NO_STRING_ORIGIN
-	forigin.file=afile;
-	forigin.line=aline;
-#endif
-
-	if(fcolumns)
-		for(int i=0; i<fcolumns->size(); i++) {
-			String name(arequest.pool());
-			name.APPEND(fcolumns->get_cstr(i), 0, 0, 0);
-			name2number.put(name, i+1);
+	name2number(new name2number_hash_class) {
+
+	if(fcolumns) {
+		size_t fcolumns_count=fcolumns->count();
+		for(size_t i=0; i<fcolumns_count; i++) {
+			const String& name=*fcolumns->unchecked_get(i);
+			name2number->put(name, i+1);
 		}
+	}
 }
 
-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 char *Table::item(int index) {
-	const Array& row=at(fcurrent);
-	return row.get_cstr(index);
+Table::Table(const Table& src, int offset, int limit) :
+	Array<element_type>(limit/*may be more than needed, no harm done*/),
+
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
+
+	append(src, offset, limit);
 }
 
-const char *Table::item(const String& column_name) {
-	int column_index;
-	if(fcolumns) {
-		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(column_name)-1; // -1 = column not found
+		if(bark && result<0)
+			throw Exception("parser.runtime",
+				&column_name,
 				"column not found");
-	} else {
-		column_index=atoi(column_name.cstr());
-		const Array& row=at(fcurrent);
-		if(column_index<0 || column_index>=row.size())
-			return 0;
-		/*
-			request.exception().raise(0, 0,
-				&column_name, 
-				"table column index %d is out of range [0..%d]", 
-				column_index, row->size()-1);
-				*/
+		return result;
+	} else // nameless
+		return column_name.as_int();
+}
+
+const String* Table::item(size_t column) {
+	if(valid(fcurrent)) {
+		element_type row=get(fcurrent);
+		if(column>=0 && column<row->count()) // proper index?
+			return row->unchecked_get(column);
+	}
+	return 0; // it's OK we don't have row|column, just return nothing
+}
+
+bool Table::locate(size_t column, const String& value) {
+	size_t scurrent=fcurrent;
+	size_t lcount=count();
+	for(fcurrent=0; fcurrent<lcount; fcurrent++) {
+		const String* item_value=item(column);
+		if(*item_value == value)
+			return true;
 	}
 
-	return item(column_index);
+	fcurrent=scurrent;
+	return false;
+}
+
+bool Table::locate(const String& column, const String& value) {
+	return locate(column_name2index(column, true), value);
+}
+
+void Table::offset(bool absolute, int offset) {
+	if(size_t lcount=count())
+		fcurrent=((absolute?0:fcurrent)+offset+lcount)%lcount;
 }