X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image_form.ml;h=52e1a205d292174b70dbe27118e80d90c3b28e20;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=d654e300b5151d53f0d667bcd8a1fc11ef03ac33;hpb=c1b34fa103bb05ed3cbef458c458a4851de41f78;p=cocanwiki.git

diff --git a/scripts/upload_image_form.ml b/scripts/upload_image_form.ml
index d654e30..52e1a20 100644
--- a/scripts/upload_image_form.ml
+++ b/scripts/upload_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: upload_image_form.ml,v 1.8 2004/11/01 16:05:27 rich Exp $
+ * $Id: upload_image_form.ml,v 1.10 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,7 +27,7 @@ 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 "upload_image_form.html" in
 
   (* If called with a 'name' argument, prefill the name field.
@@ -37,13 +37,15 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let name =
     if q#param_exists "name" then q#param "name"
     else if q#param_exists "id" then (
-      let id = int_of_string (q#param "id") in
-      let sth = dbh#prepare_cached "select coalesce (name, name_deleted)
-                                      from images
-                                     where hostid = ? and id = ?" in
-      sth#execute [`Int hostid; `Int id];
-
-      let name = sth#fetch1string () in
+      let id = Int32.of_string (q#param "id") in
+      let name = Option.get (
+	List.hd (
+	  PGSQL(dbh)
+	    "select coalesce (name, name_deleted)
+               from images
+              where hostid = $hostid and id = $id"
+	)
+      ) in
       name
     )
     else "" in