X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frecent.ml;h=5ae5092a49a950e46bc81f4788899effc2749cdd;hb=bfa88724ee152ba00c2b2fca881dd78a6599820a;hp=f726245771b73e71df45fc5962ad598718e396e9;hpb=afe5e5f759988c04d9b3bcee7cf75e2c15e1d1d5;p=cocanwiki.git diff --git a/scripts/recent.ml b/scripts/recent.ml index f726245..5ae5092 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.3 2004/09/07 14:58:34 rich Exp $ + * $Id: recent.ml,v 1.11 2006/03/27 18:09:46 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,52 +28,103 @@ 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, _, _) _ = + (* Count the number of changes. *) + let sth = dbh#prepare_cached + "select count(*)::int4 from pages where hostid = ?" in + sth#execute [Some hostid]; + let count = sth#fetch1int () in + + (* Get the offset and limit specified, and adjust them so that we will + * be displaying some changes. + *) + let offset = + try Int32.of_string (q#param "offset") with Not_found -> default_offset in + let limit = + try Int32.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" (Int32.to_string offset); + template#set "last" (Int32.to_string (min (offset + limit) count - 1)); + template#set "limit" (Int32.to_string limit); + template#set "count" (Int32.to_string count); + + template#conditional "has_next" (offset + limit < count); + template#set "next_offset" (Int32.to_string (offset + limit)); + template#conditional "has_prev" (offset > 0); + template#set "prev_offset" (Int32.to_string (max 0 (offset - limit))); + + (* Get the actual changes. *) 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]; + "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 = ? + order by p.last_modified_date desc + offset ? limit ?" in + sth#execute [Some hostid; Some offset; Some limit]; let table = sth#map (function - | [`Int version; `String url; _; `String title; - `Timestamp last_modified_date; logged_ip] -> + | [Some version; Some url; _; Some title; + `Timestamp 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 - `Null -> false, "" - | `String ip -> true, ip + None -> false, "" + | Some ip -> true, ip + | _ -> assert false in + let has_logged_user, logged_user = + match logged_user with + None -> false, "" + | Some name -> true, name | _ -> assert false in - [ "version", Template.VarString (string_of_int version); + [ "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 ] - | [`Int version; `Null; `String url; `String title; - `Timestamp last_modified_date; logged_ip] -> + | [Some version; None; Some url; Some title; + `Timestamp 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 - `Null -> false, "" - | `String ip -> true, ip + None -> false, "" + | Some ip -> true, ip + | _ -> assert false in + let has_logged_user, logged_user = + match logged_user with + None -> false, "" + | Some name -> true, name | _ -> assert false in - [ "version", Template.VarString (string_of_int version); + [ "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) in @@ -67,4 +133,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = q#template template let () = - register_script run + register_script ~restrict:[CanEdit] run