--- parser3/src/classes/table.C	2005/11/25 10:23:51	1.218
+++ parser3/src/classes/table.C	2006/06/09 19:09:19	1.223
@@ -4,7 +4,8 @@
 	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char * const IDENT_TABLE_C="$Date: 2005/11/25 10:23:51 $";
+
+static const char * const IDENT_TABLE_C="$Date: 2006/06/09 19:09:19 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -33,6 +34,10 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
+// externs
+
+extern String cycle_data_name;
+
 // defines for globals
 
 #define SQL_BIND_NAME "bind"
@@ -331,7 +336,7 @@ static void _load(Request& r, MethodPara
 	}
 	
 	Table& table=*new Table(columns);
-	int columns_count=columns->count();
+	int columns_count=columns? columns->count(): 0;
 
 	// parse cells
 	Table::element_type row(new ArrayString(columns_count));
@@ -359,9 +364,10 @@ static void maybe_enclose( String& to, c
 		to<<*sencloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
-		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before+1) {
-            to<<from.mid(pos_before+1/*+found encloser*/, pos_after-pos_before);
-			to<<*sencloser;  to<<*sencloser; // doubling encloser
+		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+            to<<from.mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
@@ -393,17 +399,20 @@ static void _save(Request& r, MethodPara
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
-		if(HashStringValue *options=params.as_no_junction(param_index++, "additional params must be hash").get_hash()) {
-			int valid_options=separators.load(*options);
-			if(valid_options!=options->count())
+		Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
+		if( voptions.is_defined() && !voptions.is_string() ) {
+			if(HashStringValue* options=voptions.get_hash()) {
+				int valid_options=separators.load(*options);
+				if(valid_options!=options->count())
+					throw Exception("parser.runtime",
+						0,
+						"invalid option passed");
+			} else {
 				throw Exception("parser.runtime",
 					0,
-					"invalid option passed");
-		} else
-			throw Exception("parser.runtime",
-				0,
-				"additional params must be hash (did you spell mode parameter correctly?)");
-		
+					"additional params must be hash (did you spell mode parameter correctly?)");
+			}
+		}
 	}
 	if(param_index<params.count())
 		throw Exception("parser.runtime",
@@ -489,6 +498,9 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
+	Temp_hash_value<const String::Body, void*> 
+		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+
 	Value& body_code=params.as_junction(0, "body must be code");
 	
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
@@ -501,6 +513,7 @@ static void _menu(Request& r, MethodPara
 		table.set_current(row);
 
 		StringOrValue sv_processed=r.process(body_code);
+		Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 		const String* s_processed=sv_processed.get_string();
 		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
@@ -508,6 +521,9 @@ static void _menu(Request& r, MethodPara
 			need_delim=true;
 		}
 		r.write_pass_lang(sv_processed);
+
+		if(lskip==Request::SKIP_BREAK)
+			break;
 	}
 	table.set_current(saved_current);
 }
@@ -917,7 +933,7 @@ int marshal_binds(HashStringValue& hash,
 	int hash_count=hash.count();
 	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
 	SQL_Driver::Placeholder* ptr=placeholders;
-	hash.for_each(marshal_bind, &ptr);
+	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
 	return hash_count;
 }