Added styling to some pages which previously were "outside" the site

[cocanwiki.git] / scripts / rename_page.ml

diff --git a/scripts/rename_page.ml b/scripts/rename_page.ml
index 5363625..8c0b0ed 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.4 2006/03/27 18:09:46 rich Exp $
+ * $Id: rename_page.ml,v 1.7 2006/07/27 16:46:55 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
@@ -34,10 +34,8 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   let page = q#param "page" in
 
   (* Cancelled? *)
-  if q#param_true "cancel" then (
+  if q#param_true "cancel" then
     q#redirect ("http://" ^ hostname ^ "/" ^ page);
-    return ()
-  );
 
   let new_title = trim (q#param "new_title") in
 
@@ -49,17 +47,16 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   );
 
   (* Get the old title. *)
-  let sth = dbh#prepare_cached "select title from pages
-                                 where hostid = ? and url = ?" in
-  sth#execute [Some hostid; Some page];
-
-  let old_title = sth#fetch1string () in
+  let old_title = List.hd (
+    PGSQL (dbh) "select title from pages
+                  where hostid = $hostid and url = $page"
+  ) in
 
   (* Generate URL for the new title. *)
   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
@@ -73,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
@@ -82,12 +79,12 @@ 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;
-                       contents = old_model.contents } in
-    let old_model = { old_model with redirect = new_page } in
-    save_page dbh hostid ~user ~r old_model;
+                       contents_ = old_model.contents_ } in
+    let old_model = { old_model with redirect = Some new_page } in
+    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"