X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fundelete_image.ml;h=615c2b824ebbe96402eb1e16177de7c27828d47e;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=8128f61e8af9caf8b919be82df57f6c196cec396;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/undelete_image.ml b/scripts/undelete_image.ml
index 8128f61..615c2b8 100644
--- a/scripts/undelete_image.ml
+++ b/scripts/undelete_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: undelete_image.ml,v 1.6 2004/09/09 12:21:22 rich Exp $
+ * $Id: undelete_image.ml,v 1.9 2006/03/28 16:24:08 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,46 +28,46 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_ok
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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 image. *)
-    let sth = dbh#prepare_cached "select 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 name_deleted from images
+                     where hostid = $hostid and id = $id"
+      )
+    ) in
 
     (* First delete any more recent versions of this image. *)
-    let sth = dbh#prepare_cached "update images
-                                     set name_deleted = name, name = null
-                                   where hostid = ? and name = ?" in
-    sth#execute [`Int hostid; `String name];
+    PGSQL(dbh)
+      "update images
+          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 image
      * becomes live.
      *)
-    let sth = dbh#prepare_cached "insert into images
-                                  (hostid, name, image, width, height,
-                                   alt, title, longdesc, class,
-                                   mime_type, thumbnail, tn_width,
-                                   tn_height, tn_mime_type, upload_date)
-                                  select hostid, name_deleted, image,
-                                         width, height, alt, title, longdesc,
-                                         class, mime_type, thumbnail,
-                                         tn_width, tn_height, tn_mime_type,
-                                         upload_date
-                                    from images
-                                   where hostid = ? and id = ?" in
-    sth#execute [`Int hostid; `Int id];
+    PGSQL(dbh) "insert into images
+                  (hostid, name, image, width, height,
+                   alt, title, longdesc, class,
+                   mime_type, thumbnail, tn_width,
+                   tn_height, tn_mime_type, upload_date)
+                select hostid, name_deleted, image,
+                       width, height, alt, title, longdesc,
+                       class, mime_type, thumbnail,
+                       tn_width, tn_height, tn_mime_type,
+                       upload_date
+                  from images
+                 where hostid = $hostid and id = $id";
 
-    dbh#commit ();
+    PGOCaml.commit dbh;
 
     (* Done. *)
     let buttons = [ ok_button "/_images" ] in
     ok ~title:"Image restored" ~buttons
-      q "Image was restored successfully."
+      dbh hostid q "Image was restored successfully."
   ) else
     q#redirect ("http://" ^ hostname ^ "/_images")