(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: largest_pages.ml,v 1.5 2006/03/28 13:20:00 rich Exp $
+ * $Id: largest_pages.ml,v 1.7 2006/12/06 09:46:57 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
let overhead = 2 (* Number of seconds to open connection + render page. *)
let run r (q : cgi) dbh hostid _ _ =
- let template = get_template dbh hostid "largest_pages.html" in
+ let template = get_template r dbh hostid "largest_pages.html" in
(* Grab the pages from the database, ordered by size.
* NB. At the moment we count the size of the markup, which is only an
let table =
List.map
- (function [pageid; page; title; Some size] ->
- let size = Int32.to_int size in
- let download_time = overhead + size / modem_speed in (* seconds *)
- let download_time =
- if download_time <= 4 then "<= 4 s"
- else if download_time < 60 then sprintf "%d s" download_time
- else sprintf "%d m %d s" (download_time / 60) (download_time mod 60)
- in
+ (fun (pageid, page, title, size) ->
+ let page = Option.get page in
+ let size = Int64.to_int (Option.get size) in
+ let download_time = overhead + size / modem_speed in (* seconds *)
+ let download_time =
+ if download_time <= 4 then "<= 4 s"
+ else if download_time < 60 then sprintf "%d s" download_time
+ else
+ sprintf "%d m %d s" (download_time / 60) (download_time mod 60)
+ in
- let size =
- if size < 4096 then sprintf "%d bytes" size
- else sprintf "%d K" (size / 1024) in
+ let size =
+ if size < 4096 then sprintf "%d bytes" size
+ else sprintf "%d K" (size / 1024) in
- [ "pageid", Template.VarString (Int32.to_string pageid);
- "page", Template.VarString page;
- "title", Template.VarString title;
- "size", Template.VarString size;
- "download_time", Template.VarString download_time ]
- | _ -> assert false) in
+ [ "pageid", Template.VarString (Int32.to_string pageid);
+ "page", Template.VarString page;
+ "title", Template.VarString title;
+ "size", Template.VarString size;
+ "download_time", Template.VarString download_time ]
+ ) rows in
template#table "pages" table;
q#template template