--- parser3/src/classes/table.C	2002/02/07 11:55:30	1.142
+++ parser3/src/classes/table.C	2002/03/27 15:30:34	1.146
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: table.C,v 1.142 2002/02/07 11:55:30 paf Exp $
+	$Id: table.C,v 1.146 2002/03/27 15:30:34 paf Exp $
 */
 
 #include "classes.h"
@@ -140,7 +140,7 @@ static void _load(Request& r, const Stri
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
-/// @todo "z\nz" "zzz""zz"
+/// @todo "x\nx" "xxx""xx"
 static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	Value& vfile_name=params->as_no_junction(params->size()-1, 
@@ -178,7 +178,7 @@ static void _save(Request& r, const Stri
 		else if(mode=="nameless")
 			/*ok, already skipped names output*/;
 		else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&mode,
 				"unknown mode, must be 'append'");
 
@@ -227,7 +227,7 @@ static void _offset(Request& r, const St
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&whence,
 					"is invalid whence, valid are 'cur' or 'set'");
 		}		    
@@ -315,7 +315,7 @@ static void _hash(Request& r, const Stri
 						value_fields+=self_table.column_name2index(value_field_name, true);
 					}
 				} else
-					throw Exception(0, 0,
+					throw Exception("parser.runtime",
 						&method_name,
 						"value field(s) must be string or self_table"
 					);
@@ -402,15 +402,46 @@ static void _sort(Request& r, const Stri
 	static_cast<VTable *>(r.self)->set_table(new_table);
 }
 
-static void _locate(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
+static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>1)
+		throw Exception("parser.runtime", 
+			&method_name,
+			"locate by expression has only one parameter - expression");
+
+	Value& expression_code=params->as_junction(0, "must be expression");
+
+	VTable& vtable=*static_cast<VTable *>(r.self);
+	Table& table=vtable.table();
+	int saved_current=table.current();
+	int size=table.size();
+	for(int row=0; row<size; row++) {
+		table.set_current(row);
+
+		if(r.process(expression_code).as_bool())
+			return true;
+	}
+	table.set_current(saved_current);
+	return false;
+}
+static bool _locate_name_value(Request& r, const String& method_name, MethodParams *params) {
+	if(params->size()>2)
+		throw Exception("parser.runtime", 
+			&method_name,
+			"locate by name and value has only two parameters - name and value");
 
 	VTable& vtable=*static_cast<VTable *>(r.self);
 	Table& table=vtable.table();
-	Value& result=*new(pool) VBool(pool, table.locate(
+	return table.locate(
 		params->as_string(0, "column name must be string"),
 		params->as_string(1, "value must be string")
-	));
+	);
+}
+static void _locate(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& result=*new(pool) VBool(pool, 
+		params->get(0).get_junction()?
+		_locate_expression(r, method_name, params) :
+		_locate_name_value(r, method_name, params));
 	result.set_name(method_name);
 	r.write_no_lang(result);
 }
@@ -455,14 +486,14 @@ static void _join(Request& r, const Stri
 
 	Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
 	if(!maybe_src)
-		throw Exception(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			"source is not a table");
 
 	Table& src=*maybe_src;
 	Table& dest=static_cast<VTable *>(r.self)->table();
 	if(&src == &dest)
-		throw Exception(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			"source and destination are same table");
 
@@ -547,7 +578,7 @@ static void _sql(Request& r, const Strin
 				if(Value *voffset=(Value *)options->get(*sql_offset_name))
 					offset=(ulong)r.process(*voffset).as_double();
 			} else
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&method_name,
 					"options must be hash");
 	}
@@ -580,7 +611,7 @@ static void _sql(Request& r, const Strin
 #endif	    			
 	} catch(const Exception& e) { // query problem
 		// more specific source [were url]
-		throw Exception(e.type(), e.code(), 
+		throw Exception("sql.execute", 
 			&statement_string, 
 			"%s", e.comment());
 	}
@@ -659,7 +690,7 @@ MTable::MTable(Pool& apool) : Methoded(a
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
-	add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);
+	add_native_method("locate", Method::CT_DYNAMIC, _locate, 1, 2);
 
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);