(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: cocanwiki_diff.ml,v 1.2 2004/10/30 10:16:10 rich Exp $
+ * $Id: cocanwiki_diff.ml,v 1.3 2004/11/01 12:57:53 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 le_re = Pcre.regexp "\r?\n"
let le_subst = Pcre.subst "\n"
-let diff_cmd ~user old_page new_page =
+let diff_cmd old_page new_page =
(* Convert line-endings in the input files from \r\n to \n. Diff
* can get confused by the \r characters, particularly in side-by-side
* mode when asked to expand tabs (-y -t).
let new_filename = output_tempfile new_page in
let old_filename = output_tempfile old_page in
- let diff_sidebyside =
- match user with
- Anonymous -> false
- | User (_, _, _, prefs) -> prefs.diff_sidebyside in
+ (* Side-by-side mode was good, but stupidly implemented. It's
+ * disabled right now.
+ *)
+ let diff_sidebyside = false in
let options =
if not diff_sidebyside then
page
)
-let get_diff (dbh : Dbi.connection) hostid ~user page ?old_version ~version ()=
+let get_diff (dbh : Dbi.connection) hostid page ?old_version ~version ()=
let old_version =
match old_version with
| Some version -> version
let old_page = get_version_for_diff dbh old_version in
(* Compute the diff of the two versions. *)
- let diff = diff_cmd ~user old_page new_page in
+ let diff = diff_cmd old_page new_page in
diff, old_version