(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: recently_visited.ml,v 1.2 2004/10/30 10:16:10 rich Exp $
+ * $Id: recently_visited.ml,v 1.4 2006/03/28 16:24:08 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
open Cocanwiki
open Cocanwiki_template
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
+let run r (q : cgi) dbh hostid _ user =
let template = get_template dbh hostid "recently_visited.html" in
let userid =
User (userid, _, _, _) -> userid
| _ -> assert false in
- let sth = dbh#prepare_cached "select rv.url, p.title, rv.visit_time
- from recently_visited rv, pages p
- where rv.hostid = ? and rv.userid = ?
- and rv.hostid = p.hostid and rv.url = p.url
- order by 3 desc" in
- sth#execute [`Int hostid; `Int userid];
-
- let table = sth#map (function [`String page; `String title; _] ->
- [ "page", Template.VarString page;
- "title", Template.VarString title ]
- | _ -> assert false) in
+ let rows = PGSQL(dbh)
+ "select rv.url, p.title, rv.visit_time
+ from recently_visited rv, pages p
+ where rv.hostid = $hostid and rv.userid = $userid
+ and rv.hostid = p.hostid and rv.url = p.url
+ order by 3 desc" in
+
+ let table = List.map (
+ fun (page, title, _) ->
+ [ "page", Template.VarString page;
+ "title", Template.VarString title ]
+ ) rows in
template#table "recently_visited" table;
q#template template