+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / edit_file_form.ml

diff --git a/scripts/edit_file_form.ml b/scripts/edit_file_form.ml
index 6db29c9..7820b33 100644 (file)
--- a/scripts/edit_file_form.ml
+++ b/scripts/edit_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: edit_file_form.ml,v 1.1 2004/11/01 17:05:14 rich Exp $
+ * $Id: edit_file_form.ml,v 1.3 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
@@ -28,26 +28,24 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_date
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
-  let template = get_template dbh hostid "edit_file_form.html" in
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template r dbh hostid "edit_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, coalesce (title, ''),
-                                       mime_type,
-                                       upload_date
-                                  from files
-                                 where hostid = ? and id = ?" in
-  sth#execute [`Int hostid; `Int id];
+  let rows = PGSQL(dbh)
+    "select name, title, mime_type, upload_date from files
+      where hostid = $hostid and id = $id and name is not null" in
 
   let name, title, mime_type, upload_date =
-    match sth#fetch1 () with
-       [ `String name; `String title; `String mime_type;
-         `Timestamp upload_date ] ->
-         name, title, mime_type, upload_date
-      | _ -> assert false in
+    match rows with
+    | [row] -> row
+    | _ -> assert false in
 
-  template#set "id" (string_of_int id);
+  let name = Option.get name in
+  let title = match title with None -> "" | Some t -> t in
+
+  template#set "id" (Int32.to_string id);
   template#set "name" name;
   template#set "title" title;
   template#set "mime_type" mime_type;