+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / admin / edit_hostnames_form.ml

diff --git a/scripts/admin/edit_hostnames_form.ml b/scripts/admin/edit_hostnames_form.ml
index 8b120b1..b698c70 100644 (file)
--- a/scripts/admin/edit_hostnames_form.ml
+++ b/scripts/admin/edit_hostnames_form.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_hostnames_form.ml,v 1.4 2004/09/09 09:35:35 rich Exp $
+ * $Id: edit_hostnames_form.ml,v 1.7 2006/03/28 16:24:08 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -14,25 +29,21 @@ open Cocanwiki_template
 
 let template = _get_template "admin/edit_hostnames_form.html"
 
-let run r (q : cgi) (dbh : Dbi.connection) _ _ _ =
-  let hostid = int_of_string (q#param "hostid") in
+let run r (q : cgi) dbh _ _ _ =
+  let hostid = Int32.of_string (q#param "hostid") in
+  template#set "id" (Int32.to_string hostid);
 
-  template#set "id" (string_of_int hostid);
+  let canonical_hostname = List.hd (
+    PGSQL(dbh)
+      "select canonical_hostname from hosts where id = $hostid"
+  ) in
 
-  let sth = dbh#prepare_cached
-             "select canonical_hostname from hosts where id = ?" in
-  sth#execute [`Int hostid];
-
-  let canonical_hostname = sth#fetch1string () in
   template#set "canonical_hostname" canonical_hostname;
 
-  let sth = dbh#prepare_cached "select name from hostnames
-                                 where hostid = ?
-                                   and name <> ?" in
-  sth#execute [`Int hostid; `String canonical_hostname];
+  let hostnames = PGSQL(dbh)
+    "select name from hostnames
+      where hostid = $hostid and name <> $canonical_hostname" in
 
-  let hostnames = sth#map (function [`String hostname] -> hostname
-                            | _ -> assert false) in
   template#set "hostnames" (String.concat "\n" hostnames);
 
   q#template template