--- parser3/src/include/pa_table.h	2001/03/19 19:17:43	1.16
+++ parser3/src/include/pa_table.h	2001/03/29 20:53:03	1.27
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.h,v 1.16 2001/03/19 19:17:43 paf Exp $
+	$Id: pa_table.h,v 1.27 2001/03/29 20:53:03 paf Exp $
 */
 
 #ifndef PA_TABLE_H
@@ -18,7 +18,7 @@
 #include "pa_request.h"
 
 /** 
-	parser \b table class backend.
+	VTable backend.
 
 	holds:
 	- column names[if any]
@@ -33,28 +33,46 @@ class Table : public Array {
 public:
 
 	Table(Pool& apool,
-		const String& asource,
+		const String *aorigin,
 		Array *acolumns,
 		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
-	/// the string source of table's data
-	//const String& source() { return fsource; }
+	/// where this table came from, may be NULL
+	const String *origin_string() { return forigin_string; }
 
 	/// column names
 	const Array *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; }
+	/// @return current pointer
+	int current() { return fcurrent; }
+	void shift(int offset);
+
+	/// @return item from @a column
+	const String *item(int column) const;
+	/// @return item from @a column
+	const String *item(const String& column) const { 
+		return item(column_name2index(column)); 
+	}
 
-	/// \return item from \a column_name
-	const String *item(const String& column_name);
+	/// saves to text file
+	void save(bool nameless_save, const String& file_spec);
 
-private:
+	bool locate(int column, const String& value);
+	bool locate(const String& column, const String& value) {
+		return locate(column_name2index(column), value);
+	}
+
+	const Array& at(int index) const {
+		// force @c const result
+		return *const_cast<const Array *>(static_cast<Array *>(get(index)));
+	}
 
-	// the base origin of table's data
-	const String& fsource;
+private:
+	
+	// where this table came from, may be NULL
+	const String *forigin_string;
 
 	// column name->number lookup table
 	Hash name2number;
@@ -65,13 +83,12 @@ private:
 	// columns
 	Array *fcolumns;
 
-	bool valid(int index) { return index>=0 && index<size();	}
+	bool valid(int index) const { return index>=0 && index<size(); }
+
+	/// @return column index from @a column_name
+	int column_name2index(const String& column) const;
 
-	const Array& at(int index);
 
-	const String *item(int column_index) {
-		return valid(fcurrent)?at(fcurrent).get_string(column_index):0;
-	}
 };
 
 #endif