--- parser3/src/classes/hash.C	2001/07/23 11:19:25	1.11
+++ parser3/src/classes/hash.C	2001/09/06 08:25:08	1.15
@@ -5,9 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: hash.C,v 1.11 2001/07/23 11:19:25 parser Exp $
+	$Id: hash.C,v 1.15 2001/09/06 08:25:08 parser Exp $
 */
-static const char *RCSId="$Id: hash.C,v 1.11 2001/07/23 11:19:25 parser Exp $"; 
+static const char *RCSId="$Id: hash.C,v 1.15 2001/09/06 08:25:08 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -34,18 +34,6 @@ public: // Methoded
 
 // methods
 
-static void _default(Request& r, const String&, MethodParams *params) { 
-	Pool& pool=r.pool();
-
-	VHash& vhash=*static_cast<VHash *>(r.self);
-	if(params->size())
-		vhash.set_default(params->get(0)); // info: may be code..
-	else {
-		Value *default_value=vhash.get_default();
-		r.write_assign_lang(default_value?*default_value:*new(pool) VVoid(pool));
-	}
-}
-
 #ifndef DOXYGEN
 class Hash_sql_event_handlers : public SQL_Driver_query_event_handlers {
 public:
@@ -88,6 +76,7 @@ public:
 			rows_hash.put(*cell, row_vhash);
 		} else
 			row_hash->put(*columns.get_string(column_index), new(pool) VString(*cell));
+		column_index++;
 	}
 
 private:
@@ -175,15 +164,11 @@ static void _keys(Request& r, const Stri
 MHash::MHash(Pool& apool) : Methoded(apool) {
 	set_name(*NEW String(pool(), HASH_CLASS_NAME));
 
-	// ^hash.default[]
-	// ^hash.default[hash]
-	add_native_method("default", Method::CT_DYNAMIC, _default, 0, 1);
-
 	// ^hash:sql[query][(count[;offset])]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
 
-	// ^hash.keys[]
-	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 0);	
+	// ^hash._keys[]
+	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0);	
 }
 
 // global variable