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

diff --git a/scripts/upload_image_form.ml b/scripts/upload_image_form.ml
index e958090..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.7 2004/09/09 12:21:22 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,9 +27,33 @@ 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.
+   * If called with an 'id' argument, get the name field from the
+   * database and prefill that field.
+   *)
+  let name =
+    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 name = Option.get (
+	List.hd (
+	  PGSQL(dbh)
+	    "select coalesce (name, name_deleted)
+               from images
+              where hostid = $hostid and id = $id"
+	)
+      ) in
+      name
+    )
+    else "" in
+  template#set "name" name;
+
+  (* Does the user want to replace an existing object? *)
+  template#conditional "replace" (q#param_true "replace");
+
   q#template template
 
 let () =