[Nym3-commit] r28 - trunk

nym3-devel@lists.noreply.org nym3-devel@lists.noreply.org
Sat, 12 Jun 2004 22:40:21 +0200


Author: laurent
Date: 2004-06-12 22:40:05 +0200 (Sat, 12 Jun 2004)
New Revision: 28

Modified:
   trunk/config.ml
Log:
ConfigParser from missinglib is easier.


Modified: trunk/config.ml
===================================================================
--- trunk/config.ml	2004-06-12 20:04:23 UTC (rev 27)
+++ trunk/config.ml	2004-06-12 20:40:05 UTC (rev 28)
@@ -2,7 +2,7 @@
 
 (* Read the configuration options from a file *)
 
-open Options
+open ConfigParser (* from missinglib *)
 
 let conffile = ref "/var/lib/nym3/conf";;
 
@@ -11,9 +11,7 @@
 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;;
+	let cp = new rawConfigParser in
+	cp#readfile !conffile;
+	userdb := cp#get "" "userdb";;