Deprecated GregorianDate.

[cocanwiki.git] / scripts / stats.ml

diff --git a/scripts/stats.ml b/scripts/stats.ml
index 3d29afb..f9b2b2a 100644 (file)
--- a/scripts/stats.ml
+++ b/scripts/stats.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: stats.ml,v 1.2 2004/10/07 16:54:24 rich Exp $
+ * $Id: stats.ml,v 1.4 2005/04/02 17:30: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
@@ -24,13 +24,12 @@ open Registry
 open Cgi
 open Printf
 
-open GregorianDate
-
 open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_server_settings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid
+    { canonical_hostname = canonical_hostname } _ =
   let template = get_template dbh hostid "stats.html" in
 
   let page = q#param "page" in
@@ -47,10 +46,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   let year, week =
     let date =
       let tm = Unix.gmtime (Unix.time ()) in
-      (tm.Unix.tm_year + 1900, tm.Unix.tm_mon + 1, tm.Unix.tm_mday)
+      Date.make (tm.Unix.tm_year + 1900) (tm.Unix.tm_mon + 1) tm.Unix.tm_mday
     in
-    fst (GregorianDate.business_of_standard date)
-  in
+    let year, week, _ = Date.to_business date in
+    year, week in
 
   template#set "year" (string_of_int year);
   template#set "week" (string_of_int week);
@@ -64,7 +63,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   template#set "page" page;
   template#set "url" url;
   template#set "hash" h;
-  template#set "hostname" hostname;
+  template#set "hostname" canonical_hostname;
 
   q#template template