Match cdvmortgage.co.uk site too.

[cocanwiki.git] / scripts / upload_image.ml

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 4101832..c777d0a 100644 (file)
--- a/scripts/upload_image.ml
+++ b/scripts/upload_image.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.ml,v 1.12 2005/11/24 14:54:13 rich Exp $
+ * $Id: upload_image.ml,v 1.14 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
@@ -35,7 +35,7 @@ open Cocanwiki_strings
 (* Valid image names. *)
 let image_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
+let run r (q : cgi) dbh hostid { hostname = hostname } user=
   let name = q#param "name" in
   let alt = q#param "alt" in
   let title = q#param "title" in
@@ -106,10 +106,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     return ()
   );
 
-  let title = if string_is_whitespace title then `Null else `String title in
+  let title = if string_is_whitespace title then None else Some title in
   let longdesc =
-    if string_is_whitespace longdesc then `Null else `String longdesc in
-  let clazz = if string_is_whitespace clazz then `Null else `String clazz in
+    if string_is_whitespace longdesc then None else Some longdesc in
+  let clazz = if string_is_whitespace clazz then None else Some clazz in
 
   (* Make a thumbnail of this image. *)
   let thumbnail, tn_mime_type, tn_width, tn_height =
@@ -119,11 +119,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
    * then we can replace it, otherwise we must present an error message.
    *)
   let replace = q#param_true "replace" in
-  let sth = dbh#prepare_cached "select 1 from images
-                                 where hostid = ? and name = ?" in
-  sth#execute [`Int hostid; `String name];
-
-  let exists = try sth#fetch1int () = 1 with Not_found -> false in
+  let rows = PGSQL(dbh) "select 1 from images
+                          where hostid = $hostid and name = $name" in
+  let exists = rows = [Some 1l] in
 
   if exists then (
     if not replace then (
@@ -131,26 +129,26 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
        dbh hostid q "An image with the same name already exists.";
     return ()
     ) else (
-      let sth = dbh#prepare_cached "update images
-                                       set name_deleted = name, name = null
-                                     where hostid = ? and name = ?" in
-      sth#execute [`Int hostid; `String name];
+      PGSQL(dbh) "update images
+                     set name_deleted = name, name = null
+                   where hostid = $hostid and name = $name"
     )
   );
 
   (* Put the image into the database. *)
-  let sth =
-    dbh#prepare_cached
-      "insert into images (hostid, name, image, width, height, alt,
-                           title, longdesc, class, thumbnail, tn_width,
-                           tn_height, mime_type, tn_mime_type)
-       values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" in
-  sth#execute [`Int hostid; `String name; `Binary image; `Int width;
-              `Int height; `String alt; title; longdesc; clazz;
-              `Binary thumbnail; `Int tn_width; `Int tn_height;
-              `String mime_type; `String tn_mime_type];
-
-  dbh#commit ();
+  let width = Int32.of_int width in
+  let height = Int32.of_int height in
+  let tn_width = Int32.of_int tn_width in
+  let tn_height = Int32.of_int tn_height in
+  PGSQL(dbh)
+    "insert into images (hostid, name, image, width, height, alt,
+                         title, longdesc, class, thumbnail, tn_width,
+                         tn_height, mime_type, tn_mime_type)
+     values ($hostid, $name, $image, $width, $height, $alt, $?title,
+             $?longdesc, $?clazz, $thumbnail, $tn_width, $tn_height,
+             $mime_type, $tn_mime_type)";
+
+  PGOCaml.commit dbh;
 
   (* Email notify. *)
   let subject = "Image " ^ name ^ " has been uploaded." in