About half way through switching cocanwiki to using the new PG interface.

[cocanwiki.git] / scripts / lib / cocanwiki_emailnotify.ml

diff --git a/scripts/lib/cocanwiki_emailnotify.ml b/scripts/lib/cocanwiki_emailnotify.ml
index 59f3b04..c63b846 100644 (file)
--- a/scripts/lib/cocanwiki_emailnotify.ml
+++ b/scripts/lib/cocanwiki_emailnotify.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_emailnotify.ml,v 1.6 2005/03/31 14:24:04 rich Exp $
+ * $Id: cocanwiki_emailnotify.ml,v 1.7 2006/03/27 16:43:44 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,12 +24,14 @@ open Registry
 open Cgi
 open Printf
 
+open ExtList
+
 open Cocanwiki
 
 (* This is where we coordinate email notification from various
  * scripts which create or update the wiki.
  *)
-let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
+let email_notify ~subject ~body ?user dbh hostid =
   (* Get own userid, if we have it.  Don't want to send email
    * notification back to the person who changed the page.  If
    * we don't have a userid, set it to 0, because no real user can
@@ -40,7 +42,7 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
   let own_userid, from =
     match user with
       | None
-      | Some Anonymous -> 0, None
+      | Some Anonymous -> 0l, None
       | Some (User (userid, _, _, prefs)) -> userid, prefs.email in
 
   (* Send a change email to everyone who hasn't opted out using
@@ -48,17 +50,17 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid =
    * 'email_notify' table.  Don't send email to invited accounts
    * who have not yet confirmed.
    *)
-  let sth = dbh#prepare_cached "select email, name
-                                  from users
-                                 where hostid = ? and id <> ? and email_notify
-                                   and email is not null
-                                   and invite is null" in
-  sth#execute [`Int hostid; `Int own_userid];
-
-  let to_addr = sth#map (function
-                          | [`String email; `String name] ->
-                              "\"" ^ name ^ "\" <" ^ email ^ ">"
-                          | _ -> assert false) in
+  let rows = PGSQL(dbh)
+    "select name, email
+       from users
+      where hostid = $hostid and id <> $own_userid and email_notify
+        and email is not null and invite is null" in
+  let to_addr = List.filter_map (
+    function
+    | (name, Some email) ->
+       Some ("\"" ^ name ^ "\" <" ^ email ^ ">")
+    | (name, None) -> None
+  ) rows in
 
   if to_addr <> [] then (
     (* Prepare the body of the message.  The assumption is that