Added {{shell}} for running external shell commands.

[cocanwiki.git] / scripts / rename_page.ml

diff --git a/scripts/rename_page.ml b/scripts/rename_page.ml
index 3e257dc..89accff 100644 (file)
--- a/scripts/rename_page.ml
+++ b/scripts/rename_page.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: rename_page.ml,v 1.6 2006/07/26 13:12:10 rich Exp $
+ * $Id: rename_page.ml,v 1.10 2006/12/06 09:46:57 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
@@ -42,7 +42,7 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   (* New title mustn't be empty string. *)
   if new_title = "" then (
     error ~back_button:true ~title:"Empty title not allowed"
-      dbh hostid q "The new title cannot be empty.";
+      r dbh hostid q "The new title cannot be empty.";
     return ()
   );
 
@@ -56,11 +56,11 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   let new_page =
     if page = "index" then page
     else
-      match Wikilib.generate_url_of_title dbh hostid new_title with
+      match Wikilib.generate_url_of_title r dbh hostid new_title with
        | Wikilib.GenURL_OK url | Wikilib.GenURL_Duplicate url -> url
        | Wikilib.GenURL_TooShort | Wikilib.GenURL_BadURL ->
            error ~title:"Bad title" ~back_button:true
-             dbh hostid q
+             r dbh hostid q
              ("The new title for the page isn't valid.  " ^
               "It may be too short or it may not contain " ^
               "enough alphabet letters.");
@@ -70,7 +70,7 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
     (* If it's the same as the old URL, then this is a simple title change. *)
     let model = load_page dbh hostid ~url:page () in
     let model = { model with pt = Title new_title } in
-    let url, _ = save_page dbh hostid ~user ~r model in
+    let url, _ = save_page r dbh hostid ~user model in
     assert (url = new_page)
   ) else (
     (* Not the same as the old URL, so set the old page to a redirect and
@@ -78,17 +78,20 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
      *)
     let old_model = load_page dbh hostid ~url:page () in
     let new_model = new_page_with_title new_title in
-    let new_model = { new_model with description = old_model.description;
+    let new_model = { new_model with
+                       description = old_model.description;
+                       keywords = old_model.keywords;
+                       noodp = old_model.noodp;
                        contents_ = old_model.contents_ } in
     let old_model = { old_model with redirect = Some new_page } in
-    ignore (save_page dbh hostid ~user ~r old_model);
+    ignore (save_page r dbh hostid ~user old_model);
 
     try
-      ignore (save_page dbh hostid ~user ~r new_model)
+      ignore (save_page r dbh hostid ~user new_model)
     with
        SaveURLError ->
          error ~title:"Page exists"
-           dbh hostid q
+           r dbh hostid q
            ("Another page with the same title exists.  " ^
             "If you tried to rename a page, then rename it back to the " ^
             "original title, then you may see this error.  This is a bug " ^
@@ -110,7 +113,7 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
 
   let buttons = [ ok_button ("/" ^ new_page) ] in
   ok ~title:"Page renamed" ~buttons
-    dbh hostid q "That page was renamed."
+    r dbh hostid q "That page was renamed."
 
 let () =
   register_script ~restrict:[CanEdit] run