X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fimage.ml;h=05589501f291a6492ecb3dcb4a478f60423324df;hb=3f0bcc30ff112dc38e882f4f08b8c37d693799ef;hp=a625d78ab51b2b3a33b3d8961b5e0a90d2908428;hpb=1d51371de1d046beac8f0519c6f789490c8033b1;p=cocanwiki.git diff --git a/scripts/image.ml b/scripts/image.ml index a625d78..0558950 100644 --- a/scripts/image.ml +++ b/scripts/image.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: image.ml,v 1.10 2004/10/24 08:48:38 rich Exp $ + * $Id: image.ml,v 1.11 2004/10/24 11:34:37 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 @@ -50,10 +50,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = sth#execute args; let data, mime_type, deleted = - match sth#fetch1 () with - [ `Binary data; `String mime_type; `Bool deleted ] -> - data, mime_type, deleted - | _ -> assert false in + try + (match sth#fetch1 () with + [ `Binary data; `String mime_type; `Bool deleted ] -> + data, mime_type, deleted + | _ -> assert false) + with + Not_found -> raise (HttpError cHTTP_NOT_FOUND) in (* If deleted, refuse to serve this image except if called from the * deleted images page.