--- parser3/src/include/pa_string.h	2001/04/09 14:31:40	1.78
+++ parser3/src/include/pa_string.h	2001/04/23 08:52:20	1.82
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.h,v 1.78 2001/04/09 14:31:40 paf Exp $
+	$Id: pa_string.h,v 1.82 2001/04/23 08:52:20 paf Exp $
 */
 
 #ifndef PA_STRING_H
@@ -114,13 +114,12 @@ 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; }
-	/// convert to C string, store to 'dest' which must be big enough for proper untaint
-	char *store_to(char *dest, 
-		Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const;
 	/// convert to C string. if 'lang' known, forcing 'lang' to it
-	char *cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const {
+	char *cstr(Untaint_lang lang=UL_UNSPECIFIED, 
+		SQL_Connection *connection=0,
+		const char *charset=0) const {
 		char *result=(char *)malloc(size()*UNTAINT_TIMES_BIGGER+1);
-		char *eol=store_to(result, lang, connection);
+		char *eol=store_to(result, lang, connection, charset);
 		*eol=0;
 		return result;
 	}
@@ -159,6 +158,11 @@ public:
 		int partial; // unused
 		return cmp(partial, src_ptr, src_size)==0; 
 	}
+	bool operator != (const char* src_ptr) const { 
+		int partial; // unused
+		return cmp(partial, src_ptr, 0)!=0; 
+	}
+
 
 	/** 
 		appends other String.
@@ -194,7 +198,8 @@ public:
 
 	typedef void (*Row_action)(Table& table, Array *row, int start, int finish, 
 		void *info);
-	bool match(const String *aorigin,
+	bool match(const unsigned char *pcre_tables,
+		const String *aorigin,		
 		const String& regexp, 
 		const String *options,
 		Table **table,
@@ -251,6 +256,11 @@ private:
 	}
 	void expand();
 
+	/// convert to C string, store to 'dest' which must be big enough for proper untaint
+	char *store_to(char *dest, Untaint_lang lang=UL_UNSPECIFIED, 
+		SQL_Connection *connection=0,
+		const char *charset=0) const;
+
 private: //disabled
 
 	String& operator = (const String&) { return *this; }