--- parser3/src/classes/hashfile.C	2001/10/23 12:41:05	1.3
+++ parser3/src/classes/hashfile.C	2001/10/24 10:26:16	1.6
@@ -4,13 +4,13 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: hashfile.C,v 1.3 2001/10/23 12:41:05 parser Exp $
+	$Id: hashfile.C,v 1.6 2001/10/24 10:26:16 parser Exp $
 */
 
 #include "pa_config_includes.h"
+#include "classes.h"
 #ifdef HAVE_LIBDB
 
-#include "classes.h"
 #include "pa_request.h"
 #include "pa_vhashfile.h"
 #include "pa_vhash.h"
@@ -71,7 +71,7 @@ static void _transaction(Request& r, con
 	}
 }
 
-static void _delete(Request& r, const String& method_name, MethodParams *params) {
+static void remove(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	VHashfile& self=*static_cast<VHashfile *>(r.self);
 	
@@ -81,7 +81,7 @@ static void _delete(Request& r, const St
 	// connection
 	DB_Connection& connection=self.get_connection(&method_name);
 
-	connection._delete(key);
+	connection.remove(key);
 }
 
 static void _clear(Request& r, const String& method_name, MethodParams *params) {
@@ -93,6 +93,16 @@ static void _clear(Request& r, const Str
 	DB_manager->clear_dbfile(r.absolute(file_spec));
 }
 
+static void _hash(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	VHashfile& self=*static_cast<VHashfile *>(r.self);
+	
+	// write out result
+	VHash& result=*new(pool) VHash(pool, *self.get_hash(&method_name));
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
+
 // constructor
 
 MHashfile::MHashfile(Pool& apool) : Methoded(apool) {
@@ -103,18 +113,16 @@ MHashfile::MHashfile(Pool& apool) : Meth
 	// ^transaction{code}
 	add_native_method("transaction", Method::CT_DYNAMIC, _transaction, 1, 1);
 	// ^hashfile.delete[key]
-	add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1);
+	add_native_method("delete", Method::CT_DYNAMIC, remove, 1, 1);
 	// ^hashfile:clear[filename]
 	add_native_method("clear", Method::CT_STATIC, _clear, 1, 1);
+	// ^hash[]
+	add_native_method("hash", Method::CT_DYNAMIC, _hash, 0, 0);
 /*
 	// ^cache[key](seconds){code}
 	add_native_method("cache", Method::CT_DYNAMIC, _cache, 3, 3);
 	// ^cancel[]
 	add_native_method("cancel", Method::CT_DYNAMIC, _cancel, 0, 0);
-	// ^pack[]
-	add_native_method("pack", Method::CT_DYNAMIC, _pack, 0, 0);
-	// ^hash[]
-	add_native_method("hash", Method::CT_DYNAMIC, _hash, 0, 0);
 	*/
 }
 
@@ -122,10 +130,16 @@ MHashfile::MHashfile(Pool& apool) : Meth
 
 Methoded *hashfile_base_class;
 
+#endif
+
 // creator
 
 Methoded *MHashfile_create(Pool& pool) {
-	return hashfile_base_class=new(pool) MHashfile(pool);
-}
-
+	return 
+#ifdef HAVE_LIBDB
+		hashfile_base_class=new(pool) MHashfile(pool)
+#else
+		0
 #endif
+	;
+}