X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flargest_pages.ml;h=161d12a63e2146db36be5772a2911c14c276beb8;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=f47d8b3bbe21a5e2e146852ba84f72377532c481;hpb=50799fee9a4c3906fe0ab9988df83af2109fa269;p=cocanwiki.git

diff --git a/scripts/largest_pages.ml b/scripts/largest_pages.ml
index f47d8b3..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.3 2004/10/04 15:19:56 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
@@ -31,7 +31,7 @@ let limit = 50
 let modem_speed = 56000 / 10		(* 56kbps modem. *)
 let overhead = 2 (* Number of seconds to open connection + render page. *)
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) dbh hostid _ _ =
   let template = get_template dbh hostid "largest_pages.html" in
 
   (* Grab the pages from the database, ordered by size.
@@ -39,34 +39,36 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
    * approximation of the final size of the page.  Also, we are not taking
    * into account images.
    *)
-  let sth =
-    dbh#prepare_cached
+  let rows =
+    PGSQL(dbh)
       "select p.id, p.url, p.title, sum (length (c.content))
          from pages p, contents c
-        where p.hostid = ? and p.url is not null and p.redirect is null
+        where p.hostid = $hostid and p.url is not null and p.redirect is null
           and c.pageid = p.id group by 1, 2, 3 order by 4 desc" in
-  sth#execute [`Int hostid];
 
   let table =
-    sth#map
-      (function [`Int pageid; `String page; `String title; `Int size] ->
-	 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
+    List.map
+      (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 (string_of_int 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