--- parser3/src/include/pa_request.h	2001/09/30 09:56:43	1.99
+++ parser3/src/include/pa_request.h	2001/11/08 11:52:34	1.110
@@ -2,9 +2,9 @@
 	Parser: request class decl.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.99 2001/09/30 09:56:43 parser Exp $
+	$Id: pa_request.h,v 1.110 2001/11/08 11:52:34 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -19,6 +19,7 @@
 #include "pa_vclass.h"
 #include "pa_vobject.h"
 #include "pa_venv.h"
+#include "pa_vstatus.h"
 #include "pa_vform.h"
 #include "pa_vmath.h"
 #include "pa_vrequest.h"
@@ -26,13 +27,6 @@
 #include "pa_vcookie.h"
 #include "pa_sql_driver_manager.h"
 
-#ifdef XML
-#	include <util/XercesDefs.hpp>
-#	include <util/PlatformUtils.hpp>
-#	include <util/TransENameMap.hpp>
-#	include <util/XML256TableTranscoder.hpp>
-#endif
-
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
@@ -55,7 +49,7 @@ class Methoded;
 
 /// Main workhorse.
 class Request : public Pooled {
-	friend Temp_lang;
+	friend class Temp_lang;
 public:
 
 	/// some information from web server
@@ -74,7 +68,8 @@ public:
 	
 	Request(Pool& apool,
 		Info& ainfo,
-		String::Untaint_lang adefault_lang ///< all tainted data default untainting lang
+		String::Untaint_lang adefault_lang, ///< all tainted data default untainting lang
+		bool status_allowed ///<  status class allowed
 	);
 	~Request() {}
 
@@ -125,6 +120,10 @@ public:
 	void write_assign_lang(Value& avalue) {
 		wcontext->write(avalue, flang); 
 	}
+	/// appending string, assigning untaint language
+	void write_assign_lang(const String& astring) {
+		wcontext->write(astring, flang); 
+	}
 	/// appending possible string, passing language built into string being written
 	void write_pass_lang(Value& avalue) {
 		wcontext->write(avalue, String::UL_PASS_APPENDED); 
@@ -148,7 +147,7 @@ public:
 	const String& mime_type_of(const char *user_file_name_cstr);
 
 	/// PCRE character tables
-	unsigned char *pcre_tables();
+	const unsigned char *pcre_tables();
 
 public:
 	
@@ -161,6 +160,8 @@ public:
 	Methoded& OP;
 	/// $env:fields
 	VEnv env;
+	/// $status:fields
+	VStatus status;
 	/// $form:elements
 	VForm form;
 	/// $math:constants
@@ -202,9 +203,12 @@ private: // core data
 	*/
 	uint anti_endless_execute_recoursion;
 
-	/// charset->pcre_tables+XML256TableTranscoder [Request_CTYPE_value]
+	/// charset->pcre_tables
 	Hash CTYPE;	
 
+	/// stack trace
+	Stack trace;
+
 private: // compile.C
 
 	VStateless_class& real_compile(COMPILE_PARAMS);
@@ -250,22 +254,6 @@ private:
 	void output_result(const VFile& body_file, bool header_only);
 };
 
-/// Request::CTYPE hash value
-class Request_CTYPE_value : public Pooled {
-public:
-	/// PCRE character tables
-	unsigned char *pcre_tables;
-#ifdef XML
-	/// Xalan transformer for this charset
-	XML256TableTranscoder *transcoder;
-#endif
-
-	Request_CTYPE_value(Pool& apool, 
-		unsigned char * apcre_tables, XML256TableTranscoder *atranscoder) : Pooled(apool),
-		pcre_tables(apcre_tables), transcoder(atranscoder) {
-	}
-};
-
 ///	Auto-object used for temporary changing Request::flang.
 class Temp_lang {
 	Request& frequest;
@@ -304,12 +292,16 @@ public:
 		return get_as(index, false, msg); 
 	}
 	/// handy expression auto-processing to double
-	double as_double(int index, Request& r) { 
-		return get_processed(index, r).as_double(); 
+	double as_double(int index, const char *msg, Request& r) { 
+		return get_processed(index, msg, r).as_double(); 
 	}
 	/// handy expression auto-processing to int
-	int as_int(int index, Request& r) { 
-		return get_processed(index, r).as_int(); 
+	int as_int(int index, const char *msg, Request& r) { 
+		return get_processed(index, msg, r).as_int(); 
+	}
+	/// handy expression auto-processing to bool
+	bool as_bool(int index, const char *msg, Request& r) { 
+		return get_processed(index, msg, r).as_bool(); 
 	}
 	/// handy string ensurer
 	const String& as_string(int index, const char *msg) { 
@@ -322,14 +314,15 @@ private:
 	Value& get_as(int index, bool as_junction, const char *msg) { 
 		Value& result=get(index);
 		if((result.get_junction()!=0) ^ as_junction)
-			THROW(0, 0,
+			throw Exception(0, 0,
 				&fmethod_name,
 				"%s (parameter #%d)", msg, 1+index);
+
 		return result;
 	}
 
-	Value& get_processed(int index, Request& r) {
-		return r.process(get(index),
+	Value& get_processed(int index, const char *msg, Request& r) {
+		return r.process(as_junction(index, msg),
 			0/*no name*/,
 			false/*don't intercept string*/);
 	}