X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fundelete_image_form.ml;h=17a96f570ba0bb45d8f732ca3e7043d5780b8f4b;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=4af1388f1051cae80cbd74164949110d459a3d0e;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/undelete_image_form.ml b/scripts/undelete_image_form.ml
index 4af1388..17a96f5 100644
--- a/scripts/undelete_image_form.ml
+++ b/scripts/undelete_image_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_image_form.ml,v 1.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: undelete_image_form.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
@@ -27,27 +27,27 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) dbh hostid _ _ =
   let template = get_template dbh hostid "undelete_image_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, width, height, alt
-                                  from images
-                                 where hostid = ? and id = ?" in
-  sth#execute [`Int hostid; `Int id];
+  let rows = PGSQL(dbh)
+    "select name, name_deleted, width, height, alt
+       from images
+      where hostid = $hostid and id = $id" in
 
   let name, width, height, alt =
-    match sth#fetch1 () with
-	[ `String name; `Null; `Int width; `Int height; `String alt]
-      | [ `Null; `String name; `Int width; `Int height; `String alt] ->
-	  name, width, height, alt
-      | _ -> assert false in
+    match rows with
+    | [ Some name, None, width, height, alt]
+    | [ None, Some name, width, height, alt] ->
+	name, width, height, alt
+    | _ -> assert false in
 
-  template#set "id" (string_of_int id);
+  template#set "id" (Int32.to_string id);
   template#set "name" name;
-  template#set "width" (string_of_int width);
-  template#set "height" (string_of_int height);
+  template#set "width" (Int32.to_string width);
+  template#set "height" (Int32.to_string height);
   template#set "alt" alt;
 
   q#template template