--- parser3/src/classes/op.C	2002/10/31 10:23:45	1.124
+++ parser3/src/classes/op.C	2003/04/04 09:59:56	1.128
@@ -1,11 +1,11 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_OP_C="$Date: 2002/10/31 10:23:45 $";
+static const char* IDENT_OP_C="$Date: 2003/04/04 09:59:56 $";
 
 #include "classes.h"
 #include "pa_common.h"
@@ -249,8 +249,8 @@ struct timeval mt[2];
 	Value& body_code=params->as_junction(1, "body must be code");
 
 	Table *protocol2driver_and_client=0;
-	if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), &r.main_class, false)) {
-		if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), sql, false)) {
+	if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), r.main_class, false)) {
+		if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), *sql, false)) {
 			protocol2driver_and_client=element->get_table();
 		}
 	}
@@ -402,9 +402,9 @@ static void locked_process_and_cache_put
 		info.data->expires=0; // flag it so that could be easily checked by caller
 }
 const String *locked_process_and_cache_put(Request& r, 
-									Value& body_code,
-									Cache_data& data,
-									const String& file_spec) {
+					   Value& body_code,
+					   Cache_data& data,
+					   const String& file_spec) {
 	Locked_process_and_cache_put_action_info info={
 		&r,
 		&data,
@@ -428,6 +428,7 @@ String *cache_get(Pool& pool, const Stri
 	if(file_read(pool, file_spec, 
 			   data, data_size, 
 			   false/*as_text*/, 
+			   0, 0, //no params&out_fields
 			   false/*fail_on_read_problem*/)
 	    && data_size/* ignore reads which are empty due to 
 			non-unary open+lockEX conflict with lockSH */) {
@@ -598,7 +599,7 @@ static void _try_operator(Request& r, co
 
 		Junction *junction=catch_code.get_junction();
 		Value *method_frame=junction->method_frame;
-		Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, method_frame, false);
+		Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, *method_frame, false);
 		junction->method_frame->put_element(*exception_var_name, &vhash, false);
 		result=r.process(catch_code);
 		bool handled=false;