X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flib%2Fcocanwiki_diff.mli;h=3ae6b7bab11d5183ab752b861fb1002888bcae01;hb=2fb2827e6f832d9a7987043c480cfe2288a881bc;hp=543257d5d3c1f77c56c98c74825b1dcab47e52fb;hpb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;p=cocanwiki.git

diff --git a/scripts/lib/cocanwiki_diff.mli b/scripts/lib/cocanwiki_diff.mli
index 543257d..3ae6b7b 100644
--- a/scripts/lib/cocanwiki_diff.mli
+++ b/scripts/lib/cocanwiki_diff.mli
@@ -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.
- * $Id: cocanwiki_diff.mli,v 1.1 2004/10/30 10:16:10 rich Exp $
+ * $Id: cocanwiki_diff.mli,v 1.4 2006/08/04 12:20:07 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
@@ -19,14 +19,14 @@
  * Boston, MA 02111-1307, USA.
  *)
 
-val page_for_diff : string -> (string * string) list -> string
+open Cocanwiki_pages
 
-val diff_cmd : user:Cocanwiki.user_t -> string -> string -> string
+val page_for_diff : model -> string option -> string
+(** model, CSS. *)
 
-val get_version_for_diff : Dbi.connection -> int -> string
+val diff_cmd : string -> string -> string
 
-val get_diff :
-  Dbi.connection ->
-  int ->
-  user:Cocanwiki.user_t ->
-  string -> ?old_version:int -> version:int -> unit -> string * int
+val get_version_for_diff : PGOCaml.pa_pg_data PGOCaml.t -> int32 -> string
+
+val get_diff : PGOCaml.pa_pg_data PGOCaml.t -> int32 ->
+  string -> ?old_version:int32 -> version:int32 -> unit -> string * int32