--- parser3/src/classes/table.C	2001/11/05 11:46:21	1.130
+++ parser3/src/classes/table.C	2001/12/15 21:28:18	1.136
@@ -4,11 +4,10 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: table.C,v 1.130 2001/11/05 11:46:21 paf Exp $
+	$Id: table.C,v 1.136 2001/12/15 21:28:18 paf Exp $
 */
 
 #include "classes.h"
-#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
@@ -38,10 +37,9 @@ public: // Methoded
 static void _set(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// data is last parameter
-	Value& vdata=params->as_junction(params->size()-1, "body must be code");
-
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	const String& data=r.process(vdata).as_string();
+	const String& data=
+		r.process(params->as_junction(params->size()-1, "body must be code")).as_string();
 
 	size_t pos_after=0;
 	// parse columns
@@ -208,8 +206,21 @@ static void _offset(Request& r, const St
 	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(params->size()) {
-		Value& offset_expr=params->as_junction(0, "offset must be expression");
-		table.shift(r.process(offset_expr).as_int());
+		bool absolute=false;
+		if(params->size()>1) {
+		    const String& whence=params->as_string(0, "whence must be string");
+		    if(whence=="cur")
+				absolute=false;
+		    else if(whence=="set")
+				absolute=true;
+		    else
+				throw Exception(0, 0,
+					&whence,
+					"is invalid whence, valid are 'cur' or 'set'");
+		}		    
+		
+		Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression");
+		table.offset(absolute, r.process(offset_expr).as_int());
 	} else {
 		Value& value=*new(pool) VInt(pool, table.current());
 		value.set_name(method_name);
@@ -413,7 +424,8 @@ static void _flip(Request& r, const Stri
 
 static void _append(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	// data is last parameter
+	// data
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	const String& string=
 		r.process(params->as_junction(0, "body must be code")).as_string();
 
@@ -467,7 +479,7 @@ public:
 		statement_string(astatement_string),
 		statement_cstr(astatement_cstr),
 		columns(*new(pool) Array(pool)),
-		row(0), row_index(0),
+		row(0), 
 		table(0)
 	{
 	}
@@ -490,7 +502,7 @@ public:
 		if(size)
 			cell->APPEND_TAINTED(
 				(const char *)ptr, size, 
-				statement_cstr, row_index++);
+				statement_cstr, table->size()-1);
 		(*row)+=cell;
 	}
 
@@ -500,7 +512,6 @@ private:
 	const String& statement_string; const char *statement_cstr;
 	Array& columns;
 	Array *row;
-	uint row_index;
 public:
 	Table *table;
 };
@@ -538,9 +549,25 @@ static void _sql(Request& r, const Strin
 	Table_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr);
 	try {
+#ifdef RESOURCES_DEBUG
+	struct timeval mt[2];
+	//measure:before
+	gettimeofday(&mt[0],NULL);
+#endif	
 		r.connection->query(
 			statement_cstr, offset, limit, 
 			handlers);
+	
+#ifdef RESOURCES_DEBUG
+		//measure:after connect
+	gettimeofday(&mt[1],NULL);
+	
+	double t[2];
+	for(int i=0;i<2;i++)
+	    t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
+	    
+	r.sql_request_time+=t[1]-t[0];
+#endif	    			
 	} catch(const Exception& e) { // query problem
 		// more specific source [were url]
 		throw Exception(e.type(), e.code(), 
@@ -602,8 +629,9 @@ MTable::MTable(Pool& apool) : Methoded(a
 	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
 
 	// ^table.offset[]  
-	// ^table.offset[offset]
-	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1);
+	// ^table.offset(offset)
+	// ^table.offset[cur|set](offset)
+	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 2);
 
 	// ^table.menu{code}  
 	// ^table.menu{code}[delim]