--- parser3/src/classes/string.C	2001/05/11 17:45:10	1.48
+++ parser3/src/classes/string.C	2001/06/28 07:41:59	1.57
@@ -5,8 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.48 2001/05/11 17:45:10 parser Exp $
+	$Id: string.C,v 1.57 2001/06/28 07:41:59 parser Exp $
 */
+static char *RCSId="$Id: string.C,v 1.57 2001/06/28 07:41:59 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -15,6 +16,7 @@
 #include "pa_vtable.h"
 #include "pa_vbool.h"
 #include "pa_string.h"
+#include "pa_sql_connection.h"
 
 // defines
 
@@ -26,7 +28,7 @@ class MString : public Methoded {
 public:
 	MString(Pool& pool);
 public: // Methoded
-	bool used_directly() { return false; }
+	bool used_directly() { return true; }
 };
 
 // methods
@@ -159,7 +161,7 @@ static void replace_action(Table& table,
 		// piece from last match['start'] to beginning of this match['finish']
 		if(start!=finish)
 			*ai.dest << ai.src->mid(start, finish);//ai.dest->APPEND_CONST("-");
-		// store found parts in one-record Vtable
+		// store found parts in one-record VTable
 		if(table.size()) // middle
 			table.put(0, row);
 		else // begin
@@ -169,7 +171,8 @@ static void replace_action(Table& table,
 			vtable.set_name(*ai.origin);
 
 			Junction *junction=ai.replacement_code->get_junction();
-			junction->rcontext=junction->root=&vtable;
+			junction->rcontext=/*must be some way to get to 
+							   outside world junction->root=*/&vtable;
 			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
 
 			/*
@@ -184,6 +187,7 @@ static void replace_action(Table& table,
 		*ai.dest << *ai.post_match;
 }
 
+/// @todo use pcre:study somehow
 static void _match(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	const String& src=*static_cast<VString *>(r.self)->get_string();
@@ -232,6 +236,86 @@ static void _match(Request& r, const Str
 	r.write_assign_lang(*result);
 }
 
+static void change_case(Request& r, const String& method_name, MethodParams *params, 
+						String::Change_case_kind kind) {
+	Pool& pool=r.pool();
+	const String& src=*static_cast<VString *>(r.self)->get_string();
+
+	r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables,
+		kind)));
+}
+static void _upper(Request& r, const String& method_name, MethodParams *params) {
+	change_case(r, method_name, params, String::CC_UPPER);
+}
+static void _lower(Request& r, const String& method_name, MethodParams *params) {
+	change_case(r, method_name, params, String::CC_LOWER);
+}
+
+String& sql_result_string(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	if(!r.connection)
+		PTHROW(0, 0,
+			&method_name,
+			"without connect");
+
+	Value& statement=params->get_junction(0, "statement must be code");
+
+	ulong offset=0;
+	if(params->size()>1) {
+		Value& offset_code=params->get_junction(1, "offset must be expression");
+		offset=(ulong)r.process(offset_code).as_double();
+	}
+
+	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);
+	unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;
+	unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;
+	bool need_rethrow=false; Exception rethrow_me;
+	PTRY {
+		r.connection->query(
+			statement_cstr, offset, 0,
+			&sql_column_count, &sql_columns,
+			&sql_row_count, &sql_rows);
+	}
+	PCATCH(e) { // query problem
+		rethrow_me=e;  need_rethrow=true;
+	}
+	PEND_CATCH
+	if(need_rethrow)
+		PTHROW(rethrow_me.type(), rethrow_me.code(),
+			&statement_string, // setting more specific source [were url]
+			rethrow_me.comment());
+	
+	if(sql_column_count!=1)
+		PTHROW(0, 0,
+			&statement_string,
+			"result must contain exactly one column");
+
+	if(sql_row_count!=1)
+		PTHROW(0, 0,
+			&statement_string,
+			"result must contain exactly one row");
+
+	String& result=*new(pool) String(pool);
+	SQL_Driver::Cell& cell=sql_rows[0][0];
+	result.APPEND_TAINTED(
+		(const char *)cell.ptr, cell.size,
+		statement_cstr, 0);
+	
+	return result;
+}
+
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	VString& result=*new(pool) VString(sql_result_string(r, method_name, params));
+	result.set_name(method_name);
+	r.write_assign_lang(result);
+}
+
 // constructor
 
 MString::MString(Pool& apool) : Methoded(apool) {
@@ -268,6 +352,15 @@ MString::MString(Pool& apool) : Methoded
 	// ^string.match[regexp][options]
 	// ^string.match[regexp][options]{replacement-code}
 	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
+
+	// ^string.toupper[]
+	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);
+	// ^string.tolower[]
+	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);
+
+	// ^string:sql[query]
+	// ^string:sql[query](offset)
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }	
 
 // global variable