[nurpawiki commit] r463 - trunk

[codesite...@google.com]

Author: jjhellst
Date: Wed Jan 14 09:05:37 2009
New Revision: 463

Modified:
trunk/config.ml
trunk/database.ml

Log:
Add host parameter to db configuration

Modified: trunk/config.ml
==============================================================================
--- trunk/config.ml (original)
+++ trunk/config.ml Wed Jan 14 09:05:37 2009
@@ -23,6 +23,7 @@
{
db_name : string;
db_user : string;
+ db_host : string option;
db_port : string option;
db_pass : string option;
}
@@ -48,20 +49,21 @@
(Element ("database", attrs, _)::_) ->
let dbname = get_attr_with_err "database" "name" attrs in
let dbuser = get_attr_with_err "database" "user" attrs in
+ let dbhost = get_attr_opt "host" attrs in
let dbport = get_attr_opt "port" attrs in
let dbpass = get_attr_opt "password" attrs in
- (dbname,dbuser,dbport,dbpass)
+ {
+ db_name = dbname;
+ db_user = dbuser;
+ db_host = dbhost;
+ db_port = dbport;
+ db_pass = dbpass;
+ }
| x::xs ->
find_dbcfg xs
| [] ->
raise (Ocsigen_extensions.Error_in_config_file ("Couldn't find
database element from config")) in
- let (dbname,dbuser,dbport,dbpass) = find_dbcfg (get_config ()) in
- {
- db_name = dbname;
- db_user = dbuser;
- db_port = dbport;
- db_pass = dbpass;
- }
+ find_dbcfg (get_config ())

let site =
let rec find_site_cfg = function

Modified: trunk/database.ml
==============================================================================
--- trunk/database.ml (original)
+++ trunk/database.ml Wed Jan 14 09:05:37 2009
@@ -73,11 +73,12 @@
Ocsigen_messages.errlog "Database connection still
bad. Bail out";
raise (Error (Psql.Connection_failure "bad
connection")))
| None ->
+ let host = Option.default "localhost" dbcfg.db_host in
+ let port = Option.default "" dbcfg.db_port in
+ let password = Option.default "" dbcfg.db_pass in
let c =
- new Psql.connection ~host:"localhost"
- ~dbname:dbcfg.db_name ~user:dbcfg.db_user
- ~port:(Option.default "" dbcfg.db_port)
- ~password:(Option.default "" dbcfg.db_pass)
+ new Psql.connection ~host ~port ~password
+ ~dbname:dbcfg.db_name ~user:dbcfg.db_user
() in
connection := Some c;
(* Search tables from nurpawiki schema first: *)