git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Scripts updated to use new PG interface.
[cocanwiki.git]
/
scripts
/
restore_form.ml
diff --git
a/scripts/restore_form.ml
b/scripts/restore_form.ml
index
68f47c4
..
f09a1fe
100644
(file)
--- a/
scripts/restore_form.ml
+++ b/
scripts/restore_form.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_form.ml,v 1.
7 2004/09/09 12:21:22
rich Exp $
+ * $Id: restore_form.ml,v 1.
13 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
*
* 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,29
+29,29
@@
open Cocanwiki_template
open Cocanwiki_ok
open Cocanwiki_diff
open Cocanwiki_ok
open Cocanwiki_diff
-let run r (q : cgi)
(dbh : Dbi.connection) hostid _ _
=
+let run r (q : cgi)
dbh hostid _ user
=
let template = get_template dbh hostid "restore_form.html" in
(* Parameters. *)
let page = q#param "page" in
let template = get_template dbh hostid "restore_form.html" in
(* Parameters. *)
let page = q#param "page" in
- let old_version =
int_
of_string (q#param "version") in
+ let old_version =
Int32.
of_string (q#param "version") in
template#set "page" page;
template#set "page" page;
- template#set "version" (
string_of_int
old_version);
+ template#set "version" (
Int32.to_string
old_version);
(* Compute the diff between the latest version of this page and the
* page we're wanting to restore.
*)
(* Compute the diff between the latest version of this page and the
* page we're wanting to restore.
*)
- let
sth = dbh#prepare_cached "select id from pages
- where hostid = ? and url = ?" in
- sth#execute [`Int hostid; `String page];
-
-
let version = sth#fetch1int (
) in
+ let
version = List.hd (
+ PGSQL(dbh)
+ "select id from pages
+ where hostid = $hostid and url = $page"
+ ) in
if version = old_version then (
error ~back_button:true ~title:"Restoring live version"
if version = old_version then (
error ~back_button:true ~title:"Restoring live version"
- q "You seem to be trying to restore the live version.";
- r
aise CgiExit
+
dbh hostid
q "You seem to be trying to restore the live version.";
+ r
eturn ()
);
let diff, _ = get_diff dbh hostid page ~old_version ~version () in
);
let diff, _ = get_diff dbh hostid page ~old_version ~version () in