X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Ffile.ml;h=0084d12278b43e97e2b86e2090ed1a2e4cc63030;hb=b9bed1282a309aaf3227ec93ccdeacce8cbb89b2;hp=6a5deb19bd925c40f3cc1ccd1809ff9f43be08a1;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/file.ml b/scripts/file.ml
index 6a5deb1..0084d12 100644
--- a/scripts/file.ml
+++ b/scripts/file.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: file.ml,v 1.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: file.ml,v 1.6 2004/09/27 12:37:54 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
@@ -9,11 +24,9 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let name = q#param "name" in
   let version =
     try Some (int_of_string (q#param "version")) with Not_found -> None in
@@ -39,7 +52,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
 
   if version <> None then
     (* 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:mime_type ();
   print_string r data