X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Frestore.ml;h=97fae79b9e4b07b28bfb6263385d89c9711c6cc1;hb=376b03d61b7640c86141fb9f1451f2a9ab4d32e7;hp=167ac9e29d9a0f57f96c34d414670d53fb5e1d73;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/restore.ml b/scripts/restore.ml
index 167ac9e..97fae79 100644
--- a/scripts/restore.ml
+++ b/scripts/restore.ml
@@ -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: restore.ml,v 1.7 2004/09/09 12:21:22 rich Exp $
+ * $Id: restore.ml,v 1.14 2004/10/21 19:54:29 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
@@ -29,7 +29,7 @@ open Cocanwiki_ok
 open Cocanwiki_diff
 open Cocanwiki_emailnotify
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let version = int_of_string (q#param "version") in
   let page = q#param "page" in
 
@@ -39,6 +39,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       try `String (Connection.remote_ip (Request.connection r))
       with Not_found -> `Null in
 
+    let logged_user =
+      match user with
+	| User (id, _, _) -> `Int id
+	| _ -> `Null in
+
     (* Copy the old version of the page to be live. *)
     let sth = dbh#prepare_cached "select title, description, creation_date,
                                          redirect, css
@@ -55,7 +60,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
     let sth =
       dbh#prepare_cached
-	"set constraints pages_redirect_cn, sitemenu_url_cn deferred" in
+	"set constraints pages_redirect_cn, sitemenu_url_cn,
+             page_emails_url_cn, links_from_cn, recently_visited_url_cn
+             deferred" in
     sth#execute [];
 
     let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@ -65,10 +72,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
     let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
                                      description, creation_date, logged_ip,
-                                     redirect, css)
-                                  values (?, ?, ?, ?, ?, ?, ?, ?)" in
+                                     logged_user, redirect, css)
+                                  values (?, ?, ?, ?, ?, ?, ?, ?, ?)" in
     sth#execute [`Int hostid; `String page; title; description;
-		 creation_date; logged_ip; redirect; css ];
+		 creation_date; logged_ip; logged_user; redirect; css ];
 
     let pageid = sth#serial "pages_id_seq" in
 
@@ -80,6 +87,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
                                    where pageid = ?" in
     sth#execute [`Int pageid; `Int version];
 
+    (* Keep the links table in synch. *)
+    Cocanwiki_links.update_links_for_page dbh hostid page;
+
     dbh#commit ();
 
     (* Email notify. *)
@@ -90,7 +100,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       "Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
       diff in
 
-    email_notify ~body ~subject dbh hostid;
+    email_notify ~body ~subject ~user dbh hostid;
 
     (* Done. *)
     let buttons = [ ok_button ("/" ^ page) ] in