--- parser3/src/classes/hash.C	2001/11/01 15:45:27	1.28
+++ parser3/src/classes/hash.C	2002/01/16 10:28:33	1.32
@@ -2,9 +2,9 @@
 	Parser: @b hash parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: hash.C,v 1.28 2001/11/01 15:45:27 paf Exp $
+	$Id: hash.C,v 1.32 2002/01/16 10:28:33 paf Exp $
 */
 
 #include "classes.h"
@@ -95,7 +95,6 @@ static void copy_all_overwrite_to(const
 	Hash& dest=*static_cast<Hash *>(info);
 	dest.put(key, value);
 }
-
 static void _create_or_add(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	
@@ -110,7 +109,6 @@ static void remove_key_from(const Hash::
 	Hash& dest=*static_cast<Hash *>(info);
 	dest.remove(key);
 }
-
 static void _sub(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	
@@ -123,7 +121,6 @@ static void copy_all_dontoverwrite_to(co
 	Hash& dest=*static_cast<Hash *>(info);
 	dest.put_dont_replace(key, value);
 }
-
 static void _union(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -153,7 +150,6 @@ static void copy_intersection_to(const H
 	if(i.b->get(key))
 		i.dest->put_dont_replace(key, value);
 }
-
 static void _intersection(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -201,11 +197,6 @@ static void _intersects(Request& r, cons
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	if(!r.connection)
-		throw Exception(0, 0,
-			&method_name,
-			"without connect");
-
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
@@ -223,13 +214,13 @@ static void _sql(Request& r, const Strin
 	Temp_lang temp_lang(r, String::UL_SQL);
 	const String& statement_string=r.process(statement).as_string();
 	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Hash& hash=static_cast<VHash *>(r.self)->hash(&method_name);
 	hash.clear();	
 	Hash_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr, hash);
 
-	r.connection->query(
+	r.connection(&method_name)->query(
 		statement_cstr, offset, limit,
 		handlers);
 }
@@ -278,7 +269,6 @@ struct Foreach_info {
 	Value *body_code;
 	Value *delim_maybe_code;
 
-	Value *var_context;
 	VString *vkey;
 	bool need_delim;
 };
@@ -289,8 +279,8 @@ static void one_foreach_cycle(const Hash
 	Foreach_info& i=*static_cast<Foreach_info *>(info);
 
 	i.vkey->set_string(akey);
-	i.var_context->put_element(*i.key_var_name, i.vkey);
-	i.var_context->put_element(*i.value_var_name, static_cast<Value *>(avalue));
+	i.r->root->put_element(*i.key_var_name, i.vkey);
+	i.r->root->put_element(*i.value_var_name, static_cast<Value *>(avalue));
 
 	Value& processed_body=i.r->process(*i.body_code);
 	if(i.delim_maybe_code) { // delimiter set?
@@ -314,7 +304,6 @@ static void _foreach(Request& r, const S
 		&body_code,
 		delim_maybe_code,
 
-		body_code.get_junction()->wcontext, 
 		new(pool) VString(pool),
 		false
 	};