X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fundelete_file.ml;h=0f0acda48aedaa283c3542f4d16a42311be22c67;hb=d2de471ff7e79c1d6096bd8132aad80258852cdd;hp=054fa55761e74f553e65912958c8f31467bf4563;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/undelete_file.ml b/scripts/undelete_file.ml
index 054fa55..0f0acda 100644
--- a/scripts/undelete_file.ml
+++ b/scripts/undelete_file.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: undelete_file.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: undelete_file.ml,v 1.10 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -9,49 +24,46 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_ok
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
-  let id = int_of_string (q#param "id") in
+let run r (q : cgi) dbh hostid { hostname = hostname } _ =
+  let id = Int32.of_string (q#param "id") in
 
   if q#param_true "yes" then (
     (* Get the name of the file. *)
-    let sth = dbh#prepare_cached "select name_deleted from files
-                                   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 name_deleted from files
+            where hostid = $hostid and id = $id"
+      )
+    ) in
 
     (* First delete any more recent versions of this file. *)
-    let sth = dbh#prepare_cached "update files
-                                     set name_deleted = name, name = null
-                                   where hostid = ? and name = ?" in
-    sth#execute [`Int hostid; `String name];
+    PGSQL(dbh) "update files
+                   set name_deleted = name, name = null
+                 where hostid = $hostid and name = $name";
 
     (* Now copy the old row, changing name_deleted back to name so the file
      * becomes live.
      *)
-    let sth = dbh#prepare_cached "insert into files
-                                  (hostid, name, content, title, mime_type,
-                                   upload_date)
-                                  select hostid, name_deleted, content,
-                                         title, mime_type, upload_date
-                                    from files
-                                   where hostid = ? and id = ?" in
-    sth#execute [`Int hostid; `Int id];
+    PGSQL(dbh) "insert into files
+                  (hostid, name, content, title, mime_type, upload_date)
+                select hostid, name_deleted, content,
+                       title, mime_type, upload_date
+                  from files
+                 where hostid = $hostid and id = $id";
 
-    dbh#commit ();
+    PGOCaml.commit dbh;
 
     (* Done. *)
     let buttons = [ ok_button "/_files" ] in
     ok ~title:"File restored" ~buttons
-      q "File was restored successfully."
+      r dbh hostid q "File was restored successfully."
   ) else
     q#redirect ("http://" ^ hostname ^ "/_files")
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run