--- parser3/src/include/pa_string.h	2008/07/15 12:51:20	1.170
+++ parser3/src/include/pa_string.h	2009/01/25 01:59:42	1.175
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char * const IDENT_STRING_H="$Date: 2008/07/15 12:51:20 $";
+static const char * const IDENT_STRING_H="$Date: 2009/01/25 01:59:42 $";
 
 // includes
 #include "pa_types.h"
@@ -97,6 +97,7 @@ public:
 		L_HTML='H',		///< HTML code
 		L_REGEX='R',	///< RegEx expression
 		L_HTTP_COOKIE='C',	///< cookies encoded as %uXXXX for compartibility with js functions encode/decode
+		L_FILE_POST='f', ///temporary escaping zero-char
 		// READ WARNING ABOVE BEFORE ADDING ANYTHING
 		L_OPTIMIZE_BIT = 0x80  ///< flag, requiring cstr whitespace optimization
 	};
@@ -400,6 +401,7 @@ public:
 
 	bool is_empty() const { return body.is_empty(); }
 	size_t length() const { return body.length(); }
+	size_t length(Charset& charset) const;
 
 	/// convert to CORD. if 'lang' known, forcing 'lang' to it
 	Body cstr_to_string_body(Language lang=L_AS_IS, 
@@ -462,6 +464,7 @@ public:
 
 	/// extracts [start, finish) piece of string
 	String& mid(size_t substr_begin, size_t substr_end) const;
+	String& mid(Charset& charset, size_t from, size_t to, size_t helper_length=0) const;
 
 	/** 
 		ignore lang if it's L_UNSPECIFIED
@@ -477,6 +480,9 @@ public:
 		size_t this_offset=0) const {
 		return body.pos(c, this_offset);
 	}
+	size_t pos(Charset& charset,
+		const String& substr, 
+		size_t this_offset=0, Language lang=L_UNSPECIFIED) const;
 
 	void split(ArrayString& result, 
 		size_t& pos_after,
@@ -514,6 +520,7 @@ public:
 	double as_double() const { return pa_atod(cstr(), this); }
 	int as_int() const { return pa_atoi(cstr(), this); }
 	bool as_bool() const { return as_int()!=0; }
+	const String& escape(Charset& source_charset) const;
 
 private: //disabled