-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: diff.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: diff.ml,v 1.10 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
open Cgi
open Printf
-open Merjisforwiki
-
open Cocanwiki
open Cocanwiki_template
open Cocanwiki_diff
-let template = get_template "diff.html"
+let run r (q : cgi) dbh hostid _ user =
+ let template = get_template dbh hostid "diff.html" in
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
let page = q#param "page" in
let page = if page = "" then "index" else page in
* NB. In case you hadn't worked it out yet, version numbers are
* page.ids.
*)
- let version = int_of_string (q#param "version") in
+ let version = Int32.of_string (q#param "version") in
let diff, old_version =
try
- let old_version = int_of_string (q#param "old_version") in
+ let old_version = Int32.of_string (q#param "old_version") in
get_diff dbh hostid page ~old_version ~version ()
with
Not_found ->
get_diff dbh hostid page ~version () in
- template#set "version" (string_of_int version);
- template#set "old_version" (string_of_int old_version);
+ template#set "version" (Int32.to_string version);
+ template#set "old_version" (Int32.to_string old_version);
template#set "page" page;
template#set "diff" diff;
q#template template
let () =
- register_script run
+ register_script ~restrict:[CanEdit] run