--- parser3/src/include/pa_request.h	2001/12/15 21:28:19	1.115
+++ parser3/src/include/pa_request.h	2002/02/08 08:30:13	1.121
@@ -1,10 +1,10 @@
 /** @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.115 2001/12/15 21:28:19 paf Exp $
+	$Id: pa_request.h,v 1.121 2002/02/08 08:30:13 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -49,10 +49,12 @@
 
 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
@@ -80,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; }
@@ -157,6 +159,16 @@ public:
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char *user_file_name_cstr);
 
+	/// 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:
 	
 	/// info from web server
@@ -189,9 +201,6 @@ public:
 	/// 'MAIN' class conglomerat
 	VStateless_class *main_class;
 
-	/// connection
-	SQL_Connection *connection;
-
 	/// classes configured data
 	Hash classes_conf;
 
@@ -220,18 +229,15 @@ private: // compile.C
 
 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
 
@@ -254,6 +260,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);
@@ -273,6 +301,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