(* 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.5 2006/03/28 16:24:08 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
);
(* 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 =
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 dbh hostid ~user ~r old_model);
try
ignore (save_page dbh hostid ~user ~r new_model)