(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: history.ml,v 1.10 2006/03/27 18:09:46 rich Exp $
+ * $Id: history.ml,v 1.11 2006/03/27 19:10:29 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 page = if page = "" then "index" else page in
template#set "page" page;
- let sth =
- dbh#prepare_cached
+ let rows =
+ PGSQL(dbh) "nullable-results"
"select p.id, p.url, p.url_deleted, p.title, p.last_modified_date,
p.logged_ip, u.name
from pages p left outer join users u on p.logged_user = u.id
- where p.hostid = ? and (p.url = ? or p.url_deleted = ?)
+ where p.hostid = $hostid and (p.url = $page or p.url_deleted = $page)
order by p.last_modified_date desc" in
- sth#execute [Some hostid; Some page; Some page];
let table =
- sth#map
+ List.map
(function
- | [Some version; Some url; _; Some title;
- `Timestamp last_modified_date; logged_ip; logged_user ] ->
+ | (Some version, Some url, _, Some title,
+ Some last_modified_date, logged_ip, logged_user) ->
let date = printable_date_time last_modified_date in
let has_logged_ip, logged_ip =
match logged_ip with
None -> false, ""
- | Some ip -> true, ip
- | _ -> assert false in
+ | Some ip -> true, ip in
let has_logged_user, logged_user =
match logged_user with
None -> false, ""
- | Some name -> true, name
- | _ -> assert false in
+ | Some name -> true, name in
[ "version", Template.VarString (Int32.to_string version);
"url", Template.VarString url;
"title", Template.VarString title;
"has_logged_user", Template.VarConditional has_logged_user;
"logged_user", Template.VarString logged_user;
"is_live", Template.VarConditional true ]
- | [Some version; None; Some url; Some title;
- `Timestamp last_modified_date; logged_ip; logged_user ] ->
+ | (Some version, None, Some url, Some title,
+ Some last_modified_date, logged_ip, logged_user) ->
let date = printable_date_time last_modified_date in
let has_logged_ip, logged_ip =
match logged_ip with
None -> false, ""
- | Some ip -> true, ip
- | _ -> assert false in
+ | Some ip -> true, ip in
let has_logged_user, logged_user =
match logged_user with
None -> false, ""
- | Some name -> true, name
- | _ -> assert false in
+ | Some name -> true, name in
[ "version", Template.VarString (Int32.to_string version);
"url", Template.VarString url;
"title", Template.VarString title;
"has_logged_user", Template.VarConditional has_logged_user;
"logged_user", Template.VarString logged_user;
"is_live", Template.VarConditional false ]
- | _ -> assert false) in
+ | _ -> assert false
+ ) rows in
template#table "history" table;