Change subject line so it shows the name of the site.

[cocanwiki.git] / scripts / delete_file.ml

diff --git a/scripts/delete_file.ml b/scripts/delete_file.ml
index 77401e0..4e37289 100644 (file)
--- 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.9 2005/11/24 14:54:11 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,31 +28,28 @@ 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 files
-                                   where hostid = ? and id = ?" in
-    sth#execute [`Int hostid; `Int id];
-    let name = sth#fetch1string () in
+    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 " ^ name ^ "#" ^ string_of_int id ^
+    let subject = "File " ^ name ^ "#" ^ Int32.to_string id ^
                  " has been deleted." in
-    let body = fun () ->
-      "Page: http://" ^ hostname ^ "/_files?deleted=1" in
+    let body = fun () -> "Page: http://" ^ hostname ^ "/_files?deleted=1" in
 
     email_notify ~body ~subject ~user dbh hostid;