X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fedit_hostnames.ml;h=32c5936eb82f44c661537fd928588b943685e255;hb=3bbcd6cd55f445a3b8b54269237655570c89354b;hp=03eed09c5b05831aeedd381143369b67f31922fb;hpb=bfa88724ee152ba00c2b2fca881dd78a6599820a;p=cocanwiki.git

diff --git a/scripts/admin/edit_hostnames.ml b/scripts/admin/edit_hostnames.ml
index 03eed09..32c5936 100644
--- a/scripts/admin/edit_hostnames.ml
+++ b/scripts/admin/edit_hostnames.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: edit_hostnames.ml,v 1.9 2006/03/27 18:09:47 rich Exp $
+ * $Id: edit_hostnames.ml,v 1.13 2006/12/06 09:46:57 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
@@ -31,13 +31,12 @@ open Cocanwiki_strings
 let split_re = Pcre.regexp "[\\s,;]+"
 
 let run r (q : cgi) dbh _ host' _ =
-  let hostid = int_of_string (q#param "hostid") in
+  let hostid = Int32.of_string (q#param "hostid") in
 
   if q#param_true "cancel" then (
     let { hostname = hostname } = host' in
     q#redirect ("http://" ^ hostname ^ "/_bin/admin/host.cmo?hostid=" ^
-		string_of_int hostid);
-    return ()
+		  Int32.to_string hostid)
   );
 
   let canonical_hostname = q#param "canonical_hostname" in
@@ -51,7 +50,7 @@ let run r (q : cgi) dbh _ host' _ =
    *)
   let check_hostname h =
     let h = trim h in			(* Trim whitespace. *)
-    let h = String.lowercase h in	(* Lowercase. *)
+    let h = lowercase h in		(* Lowercase. *)
     h
   in
 
@@ -61,19 +60,15 @@ let run r (q : cgi) dbh _ host' _ =
   let hostnames = List.filter ((<>) "") hostnames in
 
   (* Update the database. *)
-  let sth = dbh#prepare_cached
-	      "set constraints \"hosts_hostname_cn\" deferred" in
-  sth#execute [];
-  let sth = dbh#prepare_cached "update hosts set canonical_hostname = ?
-                                 where id = ?" in
-  sth#execute [`String canonical_hostname; `Int hostid];
-  let sth = dbh#prepare_cached "delete from hostnames where hostid = ?" in
-  sth#execute [`Int hostid];
-  let sth = dbh#prepare_cached "insert into hostnames (hostid, name)
-                                values (?, ?)" in
-  sth#execute [`Int hostid; `String canonical_hostname];
-  List.iter (fun name ->
-	       sth#execute [`Int hostid; `String name]) hostnames;
+  PGSQL(dbh) "set constraints \"hosts_hostname_cn\" deferred";
+  PGSQL(dbh) "update hosts set canonical_hostname = $canonical_hostname
+               where id = $hostid";
+  PGSQL(dbh) "delete from hostnames where hostid = $hostid";
+  List.iter (
+    fun name ->
+      PGSQL(dbh) "insert into hostnames (hostid, name)
+                  values ($hostid, $name)";
+  ) hostnames;
 
   (* Commit to the database. *)
   PGOCaml.commit dbh;
@@ -83,11 +78,11 @@ let run r (q : cgi) dbh _ host' _ =
     { Template.StdPages.label = "OK";
       Template.StdPages.link = "/_bin/admin/host.cmo";
       Template.StdPages.method_ = None;
-      Template.StdPages.params = [ "hostid", string_of_int hostid ] }
+      Template.StdPages.params = [ "hostid", Int32.to_string hostid ] }
   ] in
 
   ok ~title:"Saved" ~buttons
-    dbh (-1) q "Hostnames updated."
+    r dbh (-1l) q "Hostnames updated."
 
 let () =
   register_script run