git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Scripts updated to use new PG interface.
[cocanwiki.git]
/
scripts
/
recent_rss.ml
diff --git
a/scripts/recent_rss.ml
b/scripts/recent_rss.ml
index
e9424fb
..
5fe133e
100644
(file)
--- a/
scripts/recent_rss.ml
+++ b/
scripts/recent_rss.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.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: recent_rss.ml,v 1.
3 2006/03/27 18:09:46
rich Exp $
+ * $Id: recent_rss.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
*
* 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
@@
-28,7
+28,7
@@
open Cocanwiki
open Cocanwiki_template
open Cocanwiki_date
open Cocanwiki_template
open Cocanwiki_date
-let limit = 30
+let limit = 30
_l
let run r (q : cgi) dbh hostid {hostname = hostname} _ =
let template = get_template dbh hostid "recent_rss.xml" in
let run r (q : cgi) dbh hostid {hostname = hostname} _ =
let template = get_template dbh hostid "recent_rss.xml" in
@@
-36,32
+36,29
@@
let run r (q : cgi) dbh hostid {hostname = hostname} _ =
template#set "hostname" hostname;
(* Get the changes. *)
template#set "hostname" hostname;
(* Get the changes. *)
- 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
"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 =
?
+ where p.hostid =
$hostid
order by p.last_modified_date desc
order by p.last_modified_date desc
- limit ?" in
- sth#execute [Some hostid; Some limit];
+ limit $limit" in
let table =
let table =
-
sth#
map
+
List.
map
(function
(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, ""
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, ""
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;
[ "version", Template.VarString (Int32.to_string version);
"url", Template.VarString url;
"title", Template.VarString title;
@@
-71,19
+68,17
@@
let run r (q : cgi) dbh hostid {hostname = hostname} _ =
"has_logged_user", Template.VarConditional has_logged_user;
"logged_user", Template.VarString logged_user;
"is_live", Template.VarConditional true ]
"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, ""
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, ""
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;
[ "version", Template.VarString (Int32.to_string version);
"url", Template.VarString url;
"title", Template.VarString title;
@@
-93,7
+88,7
@@
let run r (q : cgi) dbh hostid {hostname = hostname} _ =
"has_logged_user", Template.VarConditional has_logged_user;
"logged_user", Template.VarString logged_user;
"is_live", Template.VarConditional false ]
"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 "recent_changes" table;
template#table "recent_changes" table;