--- parser3/src/classes/op.C	2003/11/20 17:07:44	1.140
+++ parser3/src/classes/op.C	2004/02/11 15:33:12	1.145
@@ -1,11 +1,11 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2003/11/20 17:07:44 $";
+static const char * const IDENT_OP_C="$Date: 2004/02/11 15:33:12 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -18,6 +18,7 @@ static const char * const IDENT_OP_C="$D
 #include "pa_vdate.h"
 #include "pa_vmethod_frame.h"
 #include "pa_vclass.h"
+#include "pa_charset.h"
 
 // limits
 
@@ -283,8 +284,9 @@ struct timeval mt[2];
 gettimeofday(&mt[0],NULL);
 #endif
 	// connect
-	SQL_Connection* connection=SQL_driver_manager.get_connection(url.as_string(), 
-		protocol2driver_and_client);
+	SQL_Connection* connection=SQL_driver_manager->get_connection(url.as_string(), 
+		protocol2driver_and_client,
+		r.charsets.source().NAME().cstr());
 
 #ifdef RESOURCES_DEBUG
 //measure:after connect
@@ -609,7 +611,7 @@ static void _cache(Request& r, MethodPar
 	// file_spec, expires, body code
 	const String& file_spec=r.absolute(params.as_string(0, "filespec must be string"));
 
-	Cache_scope scope={as_expires(r, params, 1, now)};
+	Cache_scope scope={as_expires(r, params, 1, now), 0};
 
 	Temp_hash_value<const String::Body, void*> 
 		cache_scope_setter(r.classes_conf, cache_data_name, &scope);