X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_file.ml;h=4e372897aea628fa0f93c7207f36f506117e36a3;hb=262f6a0c34949247ba6b78399b787e693da38d86;hp=9c1ac60e6e85d53ad2db3c77024f00f538ac1c42;hpb=2faa766a005f4fc4f1fd48a36185452f77ceb2b9;p=cocanwiki.git

diff --git a/scripts/delete_file.ml b/scripts/delete_file.ml
index 9c1ac60..4e37289 100644
--- a/scripts/delete_file.ml
+++ b/scripts/delete_file.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_file.ml,v 1.7 2004/10/21 19:54:29 rich Exp $
+ * $Id: delete_file.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,30 +28,35 @@ 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 rows = PGSQL(dbh) "select coalesce (name, name_deleted)
+                             from files
+                            where hostid = $hostid and id = $id" in
+    let name = Option.get (List.hd rows) in
+
     (* Delete the file. *)
-    let sth = dbh#prepare_cached "update files
-                                     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 files
+                   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 = "File #" ^ string_of_int id ^ " has been deleted." in
-    let body = fun () ->
-      "Page: http://" ^ hostname ^ "/_files?deleted=1" in
+    let subject = "File " ^ name ^ "#" ^ Int32.to_string id ^
+		  " has been deleted." in
+    let body = fun () -> "Page: http://" ^ hostname ^ "/_files?deleted=1" in
 
     email_notify ~body ~subject ~user dbh hostid;
 
     (* Done. *)
     let buttons = [ ok_button "/_files" ] in
     ok ~title:"File deleted" ~buttons
-      q "File was deleted successfully."
+      dbh hostid q "File was deleted successfully."
   ) else
     q#redirect ("http://" ^ hostname ^ "/_files")