[Nym3-commit] r23 - trunk

[nym3-devel@lists.noreply.org]

Author: laurent
Date: 2004-05-15 23:48:38 +0200 (Sat, 15 May 2004)
New Revision: 23

Modified:
   trunk/config.ml
   trunk/user.ml
Log:
Use the Options module for configuration.


Modified: trunk/config.ml
===================================================================
--- trunk/config.ml	2004-05-14 22:52:56 UTC (rev 22)
+++ trunk/config.ml	2004-05-15 21:48:38 UTC (rev 23)
@@ -1,4 +1,17 @@
 (* $Id$ *)
 
-let userdb = "/var/lib/nym3/userdb";; (* TODO : this should be read
-										 from a conffile *)
+open Options
+
+let conffile = ref "/var/lib/nym3/conf";;
+
+let set_conffile file = conffile := file; ();;
+
+let userdb = ref "";;
+
+let load_config =
+	let ofile = Options.create_options_file !conffile in
+	Options.load ofile;
+	let userdb_op = Options.define_option ofile ["userdb"] "User database"
+					string_option "/var/lib/nym3/userdb" in
+	userdb := !!userdb_op;;
+	

Modified: trunk/user.ml
===================================================================
--- trunk/user.ml	2004-05-14 22:52:56 UTC (rev 22)
+++ trunk/user.ml	2004-05-15 21:48:38 UTC (rev 23)
@@ -26,7 +26,7 @@
 	Dbm.close db;;
 
 let read_userdata nym =
-	let db = lockopen_userdb Config.userdb in
+	let db = lockopen_userdb !Config.userdb in
 	let marshalled = 
 	try
 		Dbm.find db nym
@@ -37,7 +37,7 @@
 	(Marshal.from_string marshalled 0 : userdata);;
 
 let write_userdata nym data =
-	let db = lockopen_userdb Config.userdb in
+	let db = lockopen_userdb !Config.userdb in
 	let marshalled = Marshal.to_string data [] in
 	Dbm.replace db nym marshalled;
 	unlockclose_userdb db;;