--- parser3/src/include/pa_string.h 2001/05/21 16:38:46 1.95 +++ parser3/src/include/pa_string.h 2001/07/18 10:06:04 1.98 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.h,v 1.95 2001/05/21 16:38:46 parser Exp $ + $Id: pa_string.h,v 1.98 2001/07/18 10:06:04 parser Exp $ */ #ifndef PA_STRING_H @@ -114,6 +114,8 @@ public: String(Pool& apool, const char *src=0, size_t src_size=0, bool tainted=false); String(const String& src); size_t size() const { return fsize; } + /// makes store_to produce origin:text\n output + void set_origins_mode(bool aorigins_mode) const { forigins_mode=aorigins_mode; } /// convert to C string. if 'lang' known, forcing 'lang' to it char *cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0, @@ -185,7 +187,7 @@ public: int pos(const String& substr, size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; /// @return position of substr in string, -1 means "not found" [const char* version] - int pos(const char *substr, size_t substr_size, + int pos(const char *substr, size_t substr_size=0, size_t this_offset=0, Untaint_lang lang=UL_UNSPECIFIED) const; void split(Array& result, @@ -218,8 +220,8 @@ public: }; String& change_case(Pool& pool, const unsigned char *pcre_tables, Change_case_kind kind) const; - double as_double(); - int as_int(); + double as_double() const; + int as_int() const; #ifndef NO_STRING_ORIGIN /// origin of string. calculated by first row @@ -266,6 +268,9 @@ private: // used rows in all chunks int fused_rows; + /// origins_mode changes behaviour of store_to[cstr()] + mutable bool forigins_mode; + private: bool chunk_is_full() {