--- parser3/src/include/pa_request.h	2003/03/24 09:54:41	1.160.2.37.2.8
+++ parser3/src/include/pa_request.h	2003/03/24 17:52:19	1.160.2.37.2.11
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char* IDENT_REQUEST_H="$Date: 2003/03/24 09:54:41 $";
+static const char* IDENT_REQUEST_H="$Date: 2003/03/24 17:52:19 $";
 
 #include "pa_request_info.h"
 #include "pa_hash.h"
@@ -52,7 +52,7 @@ class Request: public PA_Object {
 	HashStringValue fclasses;
 
 	/// already used files to avoid cyclic uses
-	Hash<const StringBody&, bool> used_files;
+	Hash<const StringBody, bool> used_files;
 
 	/**	endless execute(execute(... preventing counter 
 		@see ANTI_ENDLESS_EXECUTE_RECOURSION
@@ -209,8 +209,8 @@ public:
 	const String& mime_type_of(const char* user_file_name_cstr);
 
 	/// returns current SQL connection if any
-	SQL_Connection* connection() { 
-		if(!fconnection)
+	SQL_Connection* connection(bool fail_on_error=true) { 
+		if(fail_on_error && !fconnection)
 			throw Exception("parser.runtime",
 				0,
 				"outside of 'connect' operator");
@@ -266,17 +266,9 @@ public: // charset helpers
 	/// @see Charset::transcode
 	GdomeDOMString_auto_ptr transcode(const String& s);
 	/// @see Charset::transcode
-	const String& transcode(GdomeDOMString* s
-#ifndef NO_STRING_ORIGIN
-		, const String& origin
-#endif
-		);
+	const String& transcode(GdomeDOMString* s);
 	/// @see Charset::transcode
-	const String& transcode(xmlChar* s
-#ifndef NO_STRING_ORIGIN
-		, const String& origin
-#endif
-		);
+	const String& transcode(xmlChar* s);
 
 #endif