+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / undelete_file_form.ml

diff --git a/scripts/undelete_file_form.ml b/scripts/undelete_file_form.ml
index 6bb0d22..26720fe 100644 (file)
--- a/scripts/undelete_file_form.ml
+++ b/scripts/undelete_file_form.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_form.ml,v 1.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: undelete_file_form.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
@@ -27,23 +27,22 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
-  let template = get_template dbh hostid "undelete_file_form.html" in
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template r dbh hostid "undelete_file_form.html" in
 
-  let id = int_of_string (q#param "id") in
+  let id = Int32.of_string (q#param "id") in
 
-  let sth = dbh#prepare_cached "select name, name_deleted
-                                  from files
-                                 where hostid = ? and id = ?" in
-  sth#execute [`Int hostid; `Int id];
+  let rows = PGSQL(dbh)
+    "select name, name_deleted from files
+      where hostid = $hostid and id = $id" in
 
   let name =
-    match sth#fetch1 () with
-       [ `String name; `Null]
-      | [ `Null; `String name] -> name
-      | _ -> assert false in
+    match rows with
+    | [ Some name, None]
+    | [ None, Some name] -> name
+    | _ -> assert false in
 
-  template#set "id" (string_of_int id);
+  template#set "id" (Int32.to_string id);
   template#set "name" name;
 
   q#template template