Fixed this template to use new-style database API.

[cocanwiki.git] / scripts / hoststyle.ml

diff --git a/scripts/hoststyle.ml b/scripts/hoststyle.ml
index 642ba71..c3a259c 100644 (file)
--- a/scripts/hoststyle.ml
+++ b/scripts/hoststyle.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: hoststyle.ml,v 1.5 2004/09/27 12:37:54 rich Exp $
+ * $Id: hoststyle.ml,v 1.8 2006/03/27 19:10:29 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
@@ -27,16 +27,13 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) dbh hostid _ _ =
   (* Get the CSS. *)
-  let sth = dbh#prepare_cached "select css from hosts where id = ?" in
-  sth#execute [`Int hostid];
-
+  let css = List.hd (PGSQL(dbh) "select css from hosts where id = $hostid") in
   let css =
-    match sth#fetch1 () with
-       [ `Null ] -> ""
-      | [ `String css ] -> css
-      | _ -> assert false in
+    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
@@ -46,7 +43,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   Table.set (Request.headers_out r) "Expires" (Expires.medium ());
 
   q#header ~content_type:"text/css" ();
-  print_string r css
+  ignore (print_string r css)
 
 let () =
   register_script run