--- parser3/src/include/pa_table.h 2001/03/29 20:53:03 1.27 +++ parser3/src/include/pa_table.h 2001/05/08 08:14:53 1.32 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_table.h,v 1.27 2001/03/29 20:53:03 paf Exp $ + $Id: pa_table.h,v 1.32 2001/05/08 08:14:53 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,20 +50,25 @@ public: int current() { return fcurrent; } void shift(int offset); + /** @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 - const String *item(const String& column) const { - return item(column_name2index(column)); + + /// @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) { - return locate(column_name2index(column), value); - } + bool locate(const String& column, const String& value); const Array& at(int index) const { // force @c const result @@ -85,10 +91,6 @@ private: bool valid(int index) const { return index>=0 && index