(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: mailing_list_send.ml,v 1.7 2006/03/27 18:09:46 rich Exp $
+ * $Id: mailing_list_send.ml,v 1.8 2006/03/28 13:20:00 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
);
(* Good a place as any to delete old, unconfirmed emails. *)
- let sth = dbh#prepare_cached "delete from mailing_lists
- where pending is not null
- and entry_date < current_date - 7" in
- sth#execute [];
+ PGSQL(dbh) "delete from mailing_lists
+ where pending is not null
+ and entry_date < current_date - 7";
PGOCaml.commit dbh;
+ PGOCaml.begin_work dbh; (* We do some more writes below. *)
(* Is that email address already registered in the database? *)
- let sth = dbh#prepare_cached "select 1 from mailing_lists where hostid = ?
- and email = ?" in
- sth#execute [Some hostid; Some email];
-
- let registered = try sth#fetch1int () = 1 with Not_found -> false in
+ let rows = PGSQL(dbh)
+ "select 1 from mailing_lists where hostid = $hostid and email = $email" in
+ let registered = rows = [Some 1l] in
if registered then (
error ~title:"Email address already used" ~back_button:true
let opt_out = random_sessionid () in
(* Insert into the database. *)
- let sth = dbh#prepare_cached "insert into mailing_lists (hostid, email, name,
- pending, opt_out) values (?, ?, ?, ?, ?)" in
- sth#execute [Some hostid; Some email; Some name;
- Some pending; Some opt_out];
+ PGSQL(dbh) "insert into mailing_lists (hostid, email, name,
+ pending, opt_out)
+ values ($hostid, $email, $name, $pending, $opt_out)";
PGOCaml.commit dbh;