(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: upload_file_form.ml,v 1.9 2006/03/27 18:09:47 rich Exp $
+ * $Id: upload_file_form.ml,v 1.11 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
open Cocanwiki_template
let run r (q : cgi) dbh hostid _ _ =
- let template = get_template dbh hostid "upload_file_form.html" in
+ let template = get_template r dbh hostid "upload_file_form.html" in
(* If called with a 'name' argument, prefill the name field.
* If called with an 'id' argument, get the name field from the
if q#param_exists "name" then q#param "name"
else if q#param_exists "id" then (
let id = Int32.of_string (q#param "id") in
- let sth = dbh#prepare_cached "select coalesce (name, 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 coalesce (name, name_deleted) from files
+ where hostid = $hostid and id = $id"
+ )
+ ) in
name
)
else "" in