--- parser3/src/include/pa_request.h	2001/11/19 12:17:05	1.111
+++ parser3/src/include/pa_request.h	2002/03/27 13:33:32	1.124
@@ -1,16 +1,15 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_request.h,v 1.111 2001/11/19 12:17:05 paf Exp $
+	$Id: pa_request.h,v 1.124 2002/03/27 13:33:32 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -27,6 +26,10 @@
 #include "pa_vcookie.h"
 #include "pa_sql_driver_manager.h"
 
+#ifdef RESOURCES_DEBUG
+#include <sys/resource.h>
+#endif
+
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
@@ -46,12 +49,20 @@
 
 class Temp_lang;
 class Methoded;
+class VMethodFrame;
 
 /// Main workhorse.
 class Request : public Pooled {
 	friend class Temp_lang;
+	friend class Temp_connection;
 public:
 
+#ifdef RESOURCES_DEBUG
+	/// measures
+	double sql_connect_time;
+	double sql_request_time;
+#endif	
+
 	/// some information from web server
 	class Info {
 	public:
@@ -71,7 +82,7 @@ public:
 		uchar adefault_lang, ///< all tainted data default untainting lang
 		bool status_allowed ///<  status class allowed
 	);
-	~Request() {}
+	~Request();
 
 	/// global classes
 	Hash& classes() { return fclasses; }
@@ -131,8 +142,11 @@ public:
 	}
 	/// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
-		wcontext->write(avalue, 
-			String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT);
+		if(wcontext->get_in_expression())
+			wcontext->write(avalue);
+		else
+			wcontext->write(avalue, 
+				String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT);
 	}
 	/// appending sure value, not VString
 	void write_expr_result(Value& avalue) {
@@ -148,8 +162,15 @@ public:
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char *user_file_name_cstr);
 
-	/// PCRE character tables
-	const unsigned char *pcre_tables();
+	/// returns current SQL connection if any
+	SQL_Connection *connection(const String *source) { 
+		if(!fconnection && source)
+			throw Exception(0, 0,
+				source,
+				"outside of 'connect' operator");
+
+		return fconnection; 
+	}
 
 public:
 	
@@ -175,17 +196,20 @@ public:
 	/// $cookie:elements
 	VCookie cookie;
 
+	//@{ request processing status
+	/// execution stack
+	Stack stack;
 	/// contexts
 	Value *self, *root, *rcontext;
 	/// contexts
 	WContext *wcontext;
+	/// exception stack trace
+	Stack exception_trace;
+	//@}
 
 	/// 'MAIN' class conglomerat
 	VStateless_class *main_class;
 
-	/// connection
-	SQL_Connection *connection;
-
 	/// classes configured data
 	Hash classes_conf;
 
@@ -197,38 +221,26 @@ private: // core data
 	/// already used files to avoid cyclic uses
 	Hash used_files;
 
-	/// execution stack
-	Stack stack;
-
 	/**	endless execute(execute(... preventing counter 
 		@see ANTI_ENDLESS_EXECUTE_RECOURSION
 	*/
 	uint anti_endless_execute_recoursion;
 
-	/// charset->pcre_tables
-	Hash CTYPE;	
-
-	/// stack trace
-	Stack trace;
-
 private: // compile.C
 
 	VStateless_class& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, 
-		const Method& method, bool return_cstr=true);
-	const String *execute_virtual_method(Value& aself, 
-		const String& method_name, bool return_cstr=true);
+	const String *execute_method(Value& aself, const Method& method,
+		bool return_cstr);
+	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
+	const String *execute_virtual_method(Value& aself, const String& method_name);
 	const String *execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name, bool return_cstr=true);
-
-	Value *get_element();
+		const String& method_name,
+		bool return_cstr);
 
-private: // lang&raw 
-	
-	uchar flang;
+	Value *get_element(bool can_call_operator);
 
 private: // defaults
 
@@ -251,6 +263,28 @@ private: // lang manipulation
 		flang=alang;
 	}
 
+private: // lang&raw 
+	
+	uchar flang;
+
+
+private: // connection manipulation
+
+	SQL_Connection *set_connection(SQL_Connection *aconnection) {
+		SQL_Connection *result=fconnection;
+		fconnection=aconnection;
+		return result;
+	}
+	void restore_connection(SQL_Connection *aconnection) {
+		fconnection=aconnection;
+	}
+
+private:
+
+	/// connection
+	SQL_Connection *fconnection;
+
+
 private:
 
 	void output_result(const VFile& body_file, bool header_only);
@@ -270,6 +304,20 @@ public:
 	}
 };
 
+///	Auto-object used for temporary changing Request::fconnection.
+class Temp_connection {
+	Request& frequest;
+	SQL_Connection *saved_connection;
+public:
+	Temp_connection(Request& arequest, SQL_Connection *aconnection) : 
+		frequest(arequest),
+		saved_connection(arequest.set_connection(aconnection)) {
+	}
+	~Temp_connection() { 
+		frequest.restore_connection(saved_connection); 
+	}
+};
+
 /**
 	@b method parameters passed in this array.
 	contains handy typecast ad junction/not junction ensurers