(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: file.ml,v 1.12 2004/11/01 16:24:32 rich Exp $
+ * $Id: file.ml,v 1.16 2006/08/01 14:50:47 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
-let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
+let run r (q : cgi) dbh hostid {hostname = hostname} _ =
let name = q#param "name" in
let version =
- try Some (int_of_string (q#param "version")) with Not_found -> None in
+ try Some (Int32.of_string (q#param "version")) with Not_found -> None in
(* Get the file and its MIME type. *)
- let where, args =
- match version with
- None -> "hostid = ? and name = ?", [`Int hostid; `String name]
- | Some version ->
- "hostid = ? and (name = ? or name_deleted = ?) and id = ?",
- [`Int hostid; `String name; `String name; `Int version] in
-
- let sth =
- dbh#prepare_cached ("select content, mime_type, name is null as deleted
- from files
- where " ^ where) in
- sth#execute args;
-
let data, mime_type, deleted =
try
- (match sth#fetch1 () with
- [ `Binary data; `String mime_type; `Bool deleted ] ->
- data, mime_type, deleted
- | _ -> assert false)
+ List.hd (
+ match version with
+ | None ->
+ PGSQL(dbh) "select content, mime_type, name is null as deleted
+ from files
+ where hostid = $hostid and name = $name"
+ | Some version ->
+ PGSQL(dbh) "select content, mime_type, name is null as deleted
+ from files
+ where hostid = $hostid
+ and (name = $name or name_deleted = $name)
+ and id = $version"
+ )
with
- Not_found -> raise (HttpError cHTTP_NOT_FOUND) in
+ Not_found | ExtList.List.Empty_list | Failure "hd" ->
+ raise (HttpError cHTTP_NOT_FOUND) in
+
+ let deleted = Option.get deleted in
(* If deleted, refuse to serve this file except if called from the site. *)
if deleted then (
let referer =
try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
let ok =
- try String.find referer hostname; true
- with String.Invalid_string -> false in
+ try ignore (String.find referer hostname); true
+ with Invalid_string -> false in
if not ok then (
prerr_endline "file.ml: bandwidth theft avoided";