X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fundelete_file.ml;h=e2f42c05439955dcfb957f65ce1228c16c3cdd72;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=e86ff6ca56cc87e3a938dcfae70aae4ca62f6b24;hpb=bfa88724ee152ba00c2b2fca881dd78a6599820a;p=cocanwiki.git

diff --git a/scripts/undelete_file.ml b/scripts/undelete_file.ml
index e86ff6c..e2f42c0 100644
--- a/scripts/undelete_file.ml
+++ b/scripts/undelete_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: undelete_file.ml,v 1.8 2006/03/27 18:09:47 rich Exp $
+ * $Id: undelete_file.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
@@ -33,29 +33,28 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ =
 
   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 [Some hostid; Some 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 [Some hostid; Some 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 [Some hostid; Some 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";
 
     PGOCaml.commit dbh;