--- parser3/src/classes/string.C	2002/04/24 13:17:13	1.111
+++ parser3/src/classes/string.C	2002/08/06 12:48:14	1.115
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: string.C,v 1.111 2002/04/24 13:17:13 paf Exp $
 */
 
+static const char* IDENT_STRING_C="$Date: 2002/08/06 12:48:14 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vdouble.h"
@@ -327,7 +327,7 @@ const String* sql_result_string(Request&
 	default_code=0;
 	if(params->size()>1) {
 		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
-		if(voptions.is_defined())
+		if(!voptions.is_string())
 			if(options=voptions.get_hash(&method_name)) {
 				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
 					limit=(ulong)r.process_to_value(*vlimit).as_double();
@@ -427,7 +427,7 @@ static void _save(Request& r, const Stri
 		buf, strlen(buf), true, do_append);
 }
 
-static void _optimize(Request& r, const String& method_name, MethodParams * /*params*/) {
+static void _normalize(Request& r, const String& method_name, MethodParams * /*params*/) {
  	r.write_assign_lang(r.self->get_string()->join_chains(r.pool(), 0/*cstr*/));
 }
 
@@ -481,8 +481,8 @@ MString::MString(Pool& apool) : Methoded
 	// ^string.save[file]  
 	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
 
-	// ^string.optimize[]  
-	add_native_method("optimize", Method::CT_DYNAMIC, _optimize, 0, 0);
+	// ^string.normalize[]  
+	add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0);
 }	
 
 // global variable