X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flargest_pages.ml;h=161d12a63e2146db36be5772a2911c14c276beb8;hb=262f6a0c34949247ba6b78399b787e693da38d86;hp=90d098899d848cd9eaeedae5b597f98b645e3bdf;hpb=c912392e889fc28c6444b7e38cd92b9d0fd960a8;p=cocanwiki.git

diff --git a/scripts/largest_pages.ml b/scripts/largest_pages.ml
index 90d0988..161d12a 100644
--- a/scripts/largest_pages.ml
+++ b/scripts/largest_pages.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: largest_pages.ml,v 1.5 2006/03/28 13:20:00 rich Exp $
+ * $Id: largest_pages.ml,v 1.6 2006/03/28 16:24:07 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
@@ -48,25 +48,27 @@ let run r (q : cgi) dbh hostid _ _ =
 
   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