X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_image.ml;h=04cc50abb820096fa8211809ac41b6b0fcc580ea;hb=262f6a0c34949247ba6b78399b787e693da38d86;hp=93ae79e1463859bf8704b01eadc716852d18dc5b;hpb=e828b148d6338765d7f5ca8f10567d5d9ef00548;p=cocanwiki.git

diff --git a/scripts/delete_image.ml b/scripts/delete_image.ml
index 93ae79e..04cc50a 100644
--- a/scripts/delete_image.ml
+++ b/scripts/delete_image.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: delete_image.ml,v 1.9 2005/11/24 14:54:11 rich Exp $
+ * $Id: delete_image.ml,v 1.10 2006/03/27 18:09:46 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
@@ -28,28 +28,29 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_emailnotify
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
-  let id = int_of_string (q#param "id") in
+let run r (q : cgi) dbh hostid { hostname = hostname } user=
+  let id = Int32.of_string (q#param "id") in
 
   if q#param_true "yes" then (
     (* Get the name. *)
-    let sth = dbh#prepare_cached "select coalesce (name, name_deleted)
-                                    from images
-                                   where hostid = ? and id = ?" in
-    sth#execute [`Int hostid; `Int id];
-    let name = sth#fetch1string () in
+    let name = Option.get (
+      List.hd (
+	PGSQL(dbh) "select coalesce (name, name_deleted)
+                      from images
+                     where hostid = $hostid and id = $id"
+      )
+    ) in
 
     (* Delete the image. *)
-    let sth = dbh#prepare_cached "update images
-                                     set name_deleted = name, name = null
-                                   where hostid = ? and id = ?
-                                     and name is not null" in
-    sth#execute [`Int hostid; `Int id];
+    PGSQL(dbh) "update images
+                   set name_deleted = name, name = null
+                 where hostid = $hostid and id = $id
+                   and name is not null";
 
-    dbh#commit ();
+    PGOCaml.commit dbh;
 
     (* Email notify. *)
-    let subject = "Image " ^ name ^ "#" ^ string_of_int id ^
+    let subject = "Image " ^ name ^ "#" ^ Int32.to_string id ^
 		  " has been deleted." in
     let body = fun () ->
       "Page: http://" ^ hostname ^ "/_images?deleted=1" in