Fixed this template to use new-style database API.

[cocanwiki.git] / scripts / mailing_list_view.ml

diff --git a/scripts/mailing_list_view.ml b/scripts/mailing_list_view.ml
index 1204466..f0cfc38 100644 (file)
--- a/scripts/mailing_list_view.ml
+++ b/scripts/mailing_list_view.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: mailing_list_view.ml,v 1.3 2006/03/27 18:09:46 rich Exp $
+ * $Id: mailing_list_view.ml,v 1.4 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
@@ -40,19 +40,19 @@ let run r (q : cgi) dbh hostid _ _ =
     else "text/html", template in
 
   (* Get the mailing list. *)
-  let sth = dbh#prepare_cached "select email, name, entry_date
-                                  from mailing_lists
-                                 where hostid = ? and pending is null
-                                 order by 1" in
-  sth#execute [Some hostid];
+  let rows = PGSQL(dbh) "select email, name, entry_date
+                           from mailing_lists
+                          where hostid = $hostid and pending is null
+                          order by 1" in
 
   let table =
-    sth#map (function [Some email; Some name; `Date entry_date] ->
-              let entry_date = printable_date' entry_date in
-              [ "email", Template.VarString email;
-                "name", Template.VarString name;
-                "entry_date", Template.VarString entry_date ]
-              | _ -> assert false) in
+    List.map (
+      fun (email, name, entry_date) ->
+       let entry_date = printable_date' entry_date in
+       [ "email", Template.VarString email;
+         "name", Template.VarString name;
+         "entry_date", Template.VarString entry_date ]
+    ) rows in
 
   template#table "emails" table;