X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fhoststyle.ml;h=6781fa39f9c1738d98d693d073ec4f0076db2339;hb=10d8720cc7d9cfcaacbf61dadb56dd85ca497343;hp=32f92f976da84713f1dc23ba93bf7120d3fd2275;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/hoststyle.ml b/scripts/hoststyle.ml
index 32f92f9..6781fa3 100644
--- a/scripts/hoststyle.ml
+++ b/scripts/hoststyle.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: hoststyle.ml,v 1.6 2004/10/23 12:00:23 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -12,7 +27,7 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   (* Get the CSS. *)
   let sth = dbh#prepare_cached "select css from hosts where id = ?" in
   sth#execute [`Int hostid];
@@ -28,10 +43,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
    * people will need to hit [Shift]+Reload, I'm going to set a
    * medium-length expiry time on this resource.
    *)
-  Table.set (Request.headers_out r) "Expires" (Cgi_expires.expires_medium ());
+  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