--- parser3/src/include/pa_table.h	2001/03/28 09:01:21	1.25
+++ parser3/src/include/pa_table.h	2001/09/26 10:32:25	1.35
@@ -2,20 +2,19 @@
 	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.25 2001/03/28 09:01:21 paf Exp $
+	$Id: pa_table.h,v 1.35 2001/09/26 10:32:25 parser Exp $
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
+#include "pa_config_includes.h"
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
-#include "pa_request.h"
 
 /** 
 	VTable backend.
@@ -27,14 +26,16 @@
 
 	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 {
 public:
 
 	Table(Pool& apool,
 		const String *aorigin,
-		Array *acolumns,
+		const Array *acolumns,
 		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
 	/// where this table came from, may be NULL
@@ -49,16 +50,31 @@ public:
 	int current() { return fcurrent; }
 	void shift(int offset);
 
-	/// @return item from @a column_name
-	const String *item(const String& column) const { 
-		return item(column_name2index(column)); 
+	/** @return column index from @a column_name. '<0' if no such column
+		if no such colum conditionally 'bark'
+	*/
+	int column_name2index(const String& column, bool bark) const;
+
+	/// @return item from @a column
+	const String *item(int column) const;
+
+	/// @return item from @a column. '0' if no such column
+	const String *item(const String& column) const {
+		int index=column_name2index(column, false);
+		return index>=0?item(index):0;
 	}
 
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
+	bool locate(int column, const String& value);
 	bool locate(const String& column, const String& value);
 
+	const Array& at(int index) const {
+		// force @c const result
+		return *const_cast<const Array *>(static_cast<Array *>(get(index)));
+	}
+
 private:
 	
 	// where this table came from, may be NULL
@@ -71,20 +87,10 @@ private:
 	int fcurrent;
 
 	// columns
-	Array *fcolumns;
+	const Array *fcolumns;
 
 	bool valid(int index) const { return index>=0 && index<size(); }
 
-	const Array& at(int index) const {
-		// force @c const result
-		return *const_cast<const Array *>(static_cast<Array *>(get(index)));
-	}
-
-	/// @return column index from @a column_name
-	int column_name2index(const String& column) const;
-
-	const String *item(int column) const;
-
 };
 
 #endif