X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frecent.ml;h=2ff1e671e674e01c385b19b1ed2b19150f2bf86f;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=4af4886a23f262723913db2c46550ca036e9056d;hpb=ca4d4140c5ab4b351dd5483337cf61e8e9fa94e6;p=cocanwiki.git diff --git a/scripts/recent.ml b/scripts/recent.ml index 4af4886..2ff1e67 100644 --- a/scripts/recent.ml +++ b/scripts/recent.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: recent.ml,v 1.4 2004/09/08 09:54:28 rich Exp $ + * $Id: recent.ml,v 1.12 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *) open Apache @@ -13,54 +28,104 @@ open Cocanwiki open Cocanwiki_template open Cocanwiki_date -let template = get_template "recent.html" +let default_offset = 0 +let default_limit = 100 +let max_limit = 1000 -let max_age = "3 months" +let run r (q : cgi) dbh hostid _ _ = + let template = get_template dbh hostid "recent.html" in -let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = - let sth = - dbh#prepare_cached - "select id, url, url_deleted, title, last_modified_date, logged_ip - from pages - where hostid = ? - and last_modified_date >= current_timestamp - interval ? - order by last_modified_date desc" in - sth#execute [`Int hostid; `String max_age]; + (* Count the number of changes. *) + let count = Option.get ( + List.hd ( + PGSQL(dbh) "select count(*) from pages where hostid = $hostid" + ) + ) in + let count = Int64.to_int count in + + (* Get the offset and limit specified, and adjust them so that we will + * be displaying some changes. + *) + let offset = + try int_of_string (q#param "offset") with Not_found -> default_offset in + let limit = + try int_of_string (q#param "limit") with Not_found -> default_limit in + + let limit = + if limit < 1 then 1 + else if limit > max_limit then max_limit + else limit in + let offset = + if offset < 0 then 0 + else if offset >= count then max 0 (count - limit) + else offset in + + template#set "offset" (string_of_int offset); + template#set "last" (string_of_int (min (offset + limit) count - 1)); + template#set "limit" (string_of_int limit); + template#set "count" (string_of_int count); + + template#conditional "has_next" (offset + limit < count); + template#set "next_offset" (string_of_int (offset + limit)); + template#conditional "has_prev" (offset > 0); + template#set "prev_offset" (string_of_int (max 0 (offset - limit))); + + (* Get the actual changes. *) + let rows = + let offset = Int32.of_int offset in + let limit = Int32.of_int limit in + 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 = $hostid + order by p.last_modified_date desc + offset $offset limit $limit" in let table = - sth#map + List.map (function - | [`Int version; `String url; _; `String title; - `Timestamp last_modified_date; logged_ip] -> - let date = printable_date_time last_modified_date in - let has_logged_ip, logged_ip = - match logged_ip with - `Null -> false, "" - | `String ip -> true, ip - | _ -> assert false in - [ "version", Template.VarString (string_of_int version); - "url", Template.VarString url; - "title", Template.VarString title; - "last_modified_date", Template.VarString date; - "has_logged_ip", Template.VarConditional has_logged_ip; - "logged_ip", Template.VarString logged_ip; - "is_live", Template.VarConditional true ] - | [`Int version; `Null; `String url; `String title; - `Timestamp last_modified_date; logged_ip] -> - let date = printable_date_time last_modified_date in - let has_logged_ip, logged_ip = - match logged_ip with - `Null -> false, "" - | `String ip -> true, ip - | _ -> assert false in - [ "version", Template.VarString (string_of_int version); - "url", Template.VarString url; - "title", Template.VarString title; - "last_modified_date", Template.VarString date; - "has_logged_ip", Template.VarConditional has_logged_ip; - "logged_ip", Template.VarString logged_ip; - "is_live", Template.VarConditional false ] - | _ -> assert false) in + | (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 in + let has_logged_user, logged_user = + match logged_user with + None -> false, "" + | Some name -> true, name in + [ "version", Template.VarString (Int32.to_string version); + "url", Template.VarString url; + "title", Template.VarString title; + "last_modified_date", Template.VarString date; + "has_logged_ip", Template.VarConditional has_logged_ip; + "logged_ip", Template.VarString logged_ip; + "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, + 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 in + let has_logged_user, logged_user = + match logged_user with + None -> false, "" + | Some name -> true, name in + [ "version", Template.VarString (Int32.to_string version); + "url", Template.VarString url; + "title", Template.VarString title; + "last_modified_date", Template.VarString date; + "has_logged_ip", Template.VarConditional has_logged_ip; + "logged_ip", Template.VarString logged_ip; + "has_logged_user", Template.VarConditional has_logged_user; + "logged_user", Template.VarString logged_user; + "is_live", Template.VarConditional false ] + | _ -> assert false) rows in template#table "recent_changes" table;