git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added machine-parsable links database, per-page links and page source.
[cocanwiki.git]
/
scripts
/
restore.ml
diff --git
a/scripts/restore.ml
b/scripts/restore.ml
index
53fb478
..
97fae79
100644
(file)
--- 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.
(* 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.
8 2004/09/21 13:01:16
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
*
* 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
@@
-60,7
+60,9
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
let sth =
dbh#prepare_cached
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,
sth#execute [];
let sth = dbh#prepare_cached "update pages set url_deleted = url,
@@
-85,6
+87,9
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
where pageid = ?" in
sth#execute [`Int pageid; `Int version];
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. *)
dbh#commit ();
(* Email notify. *)
@@
-95,7
+100,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
"Page: http://" ^ hostname ^ "/" ^ page ^ "\n\n" ^
diff in
"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
(* Done. *)
let buttons = [ ok_button ("/" ^ page) ] in