--- parser3/src/include/pa_table.h	2001/03/19 20:07:37	1.17
+++ parser3/src/include/pa_table.h	2003/02/06 10:27:04	1.48.2.11
@@ -1,24 +1,21 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_table.h,v 1.17 2001/03/19 20:07:37 paf Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
+static const char* IDENT_TABLE_H="$Date: 2003/02/06 10:27:04 $";
+
 #include "pa_types.h"
-#include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
-#include "pa_request.h"
 
 /** 
-	parser \b table class backend.
+	VTable backend.
 
 	holds:
 	- column names[if any]
@@ -27,51 +24,74 @@
 
 	uses String for column names and data items
 
-	hence most of tables are "named", no need to uptimize nameless onces
+	hence most of tables are "named", no need to uptimize nameless onces.
+	rows and strings stored are read-only. once stored they can be removed,
+	but not altered. that's handy for quick copying & co. see table:join
 */
-class Table : public Array {
+class Table: public Array<ArrayStringPtr> {
 public:
+	typedef ArrayStringPtr columns_type;
 
-	Table(Pool& apool,
-		const String& asource,
-		Array *acolumns,
-		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+	Table(
+		StringPtr aorigin_string,
+		columns_type acolumns,
+		int initial_rows=3);
+	Table(const Table& src, int offset=0, int limit=0);
 
-	/// the string source of table's data
-	//const String& source() { return fsource; }
+	/// where this table came from, may be NULL
+	StringPtr origin_string() { return forigin_string; }
 
-	/// column names
-	const Array *columns() { return fcolumns; }
+	/// gets column names
+	columns_type columns() { return fcolumns; }
 
-	/// moves \a current pointer
+	/// moves @a current pointer
 	void set_current(int acurrent) { fcurrent=acurrent; }
 	/// @return current pointer
-	int get_current() { return fcurrent; }
+	int current() const { return fcurrent; }
+	void offset(bool absolute, int offset);
 
-	/// @return item from \a column_name
-	const String *item(const String& column_name);
+	/** @return column index from @a column_name. '<0' if no such column
+		if no such - 'bark'
+	*/
+	int column_name2index(StringPtr column, bool bark) const;
+
+	/// @return item from @a column
+	StringPtr item(int column);
+
+	/// @return item from @a column. '0' if no such column
+	StringPtr item(StringPtr column) {
+		int index=column_name2index(column, false);
+		return index>=0?item(index):StringPtr(0);
+	}
 
-private:
+	/// saves to text file
+	void save(bool nameless_save, object_ptr<const String> file_spec);
 
-	// the base origin of table's data
-	const String& fsource;
+	bool locate(int column, StringPtr value);
+	bool locate(StringPtr column, StringPtr value);
 
-	// column name->number lookup table
-	Hash name2number;
+private:
+	
+	// where this table came from, may be NULL
+	StringPtr forigin_string;
 
 	// current row
 	int fcurrent;
 
 	// columns
-	Array *fcolumns;
+	columns_type fcolumns;
 
-	bool valid(int index) { return index>=0 && index<size();	}
+	// column names are already referenced in fcolumns, no need to doublecheck references here
+	// column name->number lookup table
+	typedef Hash<const String&, int> name2number_hash_class;
+	object_ptr<name2number_hash_class> name2number;
 
-	const Array& at(int index);
+	// we own columns?
+
+	bool valid(int index) const { return index>=0 && index<count(); }
 
-	const String *item(int column_index) {
-		return valid(fcurrent)?at(fcurrent).get_string(column_index):0;
-	}
 };
 
+typedef object_ptr<Table> TablePtr;
+
 #endif