--- parser3/src/include/pa_table.h	2001/03/28 09:01:21	1.25
+++ parser3/src/include/pa_table.h	2001/05/07 08:29:42	1.30
@@ -5,7 +5,7 @@
 
 	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.30 2001/05/07 08:29:42 paf Exp $
 */
 
 #ifndef PA_TABLE_H
@@ -15,7 +15,6 @@
 #include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
-#include "pa_request.h"
 
 /** 
 	VTable backend.
@@ -27,7 +26,9 @@
 
 	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:
@@ -49,15 +50,30 @@ 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
+	int column_name2index(const String& column) 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);
+		return index>=0?item(index):0;
 	}
 
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
-	bool locate(const String& column, const String& value);
+	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)));
+	}
 
 private:
 	
@@ -75,16 +91,6 @@ private:
 
 	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