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

diff --git a/scripts/delete_image.ml b/scripts/delete_image.ml
index 5b64357..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.7 2004/10/21 19:54:29 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,29 +28,39 @@ 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 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 #" ^ string_of_int id ^ " has been deleted." in
+    let subject = "Image " ^ name ^ "#" ^ Int32.to_string id ^
+		  " has been deleted." in
     let body = fun () ->
       "Page: http://" ^ hostname ^ "/_images?deleted=1" in
 
     email_notify ~body ~subject ~user dbh hostid;
+
     (* Done. *)
     let buttons = [ ok_button "/_images" ] in
     ok ~title:"Image deleted" ~buttons
-      q "Image was deleted successfully."
+      dbh hostid q "Image was deleted successfully."
   ) else
     q#redirect ("http://" ^ hostname ^ "/_images")