(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: pagestyle.ml,v 1.7 2006/03/27 18:09:46 rich Exp $
+ * $Id: pagestyle.ml,v 1.8 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
try Some (Int32.of_string (q#param "version")) with Not_found -> None in
(* Get the CSS. *)
- let sth =
- match version with
- None ->
- let sth = dbh#prepare_cached
- "select css from pages where hostid = ? and url = ?" in
- sth#execute [Some hostid; Some page];
- sth
- | Some version ->
- let sth = dbh#prepare_cached
- "select css from pages
- where hostid = ? and id = ? and
- (url = ? or url_deleted = ?)" in
- sth#execute [Some hostid; Some version; Some page; Some page];
- sth in
let css =
- match sth#fetch1 () with
- [ None ] -> ""
- | [ Some css ] -> css
- | _ -> assert false in
+ match version with
+ | None ->
+ List.hd (
+ PGSQL(dbh)
+ "select css from pages where hostid = $hostid and url = $page"
+ )
+ | Some version ->
+ List.hd (
+ PGSQL(dbh)
+ "select css from pages
+ where hostid = $hostid and id = $version and
+ (url = $page or url_deleted = $page)"
+ ) in
+
+ let css = match css with None -> "" | Some css -> css in
(* It's crucial, for speed of page delivery and rendering, to have
* an expires header for CSS. Even though this means that occasionally