X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=852302bb348f73ac6246b8aa8b617c757fbd7360;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=fc567b0f41823900afcddcf631acb73ae8888c66;hpb=6ad484dd47c27fd54c2f26fb931ba125bae9abc6;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index fc567b0..852302b 100644
--- a/scripts/upload_file.ml
+++ b/scripts/upload_file.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_file.ml,v 1.10 2004/11/01 17:05:14 rich Exp $
+ * $Id: upload_file.ml,v 1.13 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
@@ -36,7 +36,7 @@ open Cocanwiki_strings
 (* Valid file names. *)
 let file_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*$"
 
-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 title = q#param "title" in
 
@@ -48,54 +48,49 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     with
 	Not_found ->
 	  error ~title:"No file" ~back_button:true
-	    q "No file was uploaded.";
+	    dbh hostid q "No file was uploaded.";
 	  return () in
 
   (* Check the name is valid. *)
   if not (Pcre.pmatch ~rex:file_ok_re name) then (
     error ~title:"Bad File Name" ~back_button:true
-      q ("The File Name must contain only lowercase English letters, " ^
-	 "numbers, dots, dashes and underscore.");
+      dbh hostid q
+      ("The File Name must contain only lowercase English letters, " ^
+       "numbers, dots, dashes and underscore.");
     return ()
   );
 
   (* Identify the MIME type from the extension. *)
   let mime_type = mime_type_of_filename name in
 
-  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
 
   (* Check if something with the same name already exists.  If replace=1
    * 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 files
-                                 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 files where hostid = $hostid and name = $name" in
+  let exists = rows = [Some 1l] in
 
   if exists then (
     if not replace then (
       error ~title:"File already exists" ~back_button:true
-	q ("An file with the same name already exists.");
+	dbh hostid q "An file with the same name already exists.";
     return ()
     ) else (
-      let sth = dbh#prepare_cached "update files
-                                       set name_deleted = name, name = null
-                                     where hostid = ? and name = ?" in
-      sth#execute [`Int hostid; `String name];
+      PGSQL(dbh) "update files
+                     set name_deleted = name, name = null
+                   where hostid = $hostid and name = $name"
     )
   );
 
   (* Put the file into the database. *)
-  let sth =
-    dbh#prepare_cached
-      "insert into files (hostid, name, content, title, mime_type)
-       values (?, ?, ?, ?, ?)" in
-  sth#execute [`Int hostid; `String name; `Binary file; title;
-	       `String mime_type];
+  PGSQL(dbh)
+    "insert into files (hostid, name, content, title, mime_type)
+     values ($hostid, $name, $file, $?title, $mime_type)";
 
-  dbh#commit ();
+  PGOCaml.commit dbh;
 
   (* Email notify. *)
   let subject = "File " ^ name ^ " has been uploaded." in
@@ -106,7 +101,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
 
   let buttons = [ ok_button "/_files" ] in
   ok ~title:"File uploaded" ~buttons
-    q "File was uploaded successfully."
+    dbh hostid q "File was uploaded successfully."
 
 let () =
   register_script ~restrict:[CanEdit] run