(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_page_css.ml,v 1.21 2006/07/26 13:41:37 rich Exp $
+ * $Id: edit_page_css.ml,v 1.24 2006/08/17 09:11:31 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
* us to revert changes to the CSS easily.
*)
let rows = PGSQL(dbh)
- "select id, title, description, creation_date, redirect
+ "select id, title, description, keywords, noodp, creation_date, redirect
from pages
where hostid = $hostid and url = $page" in
- let oldpageid, title, description, creation_date, redirect =
+ let oldpageid, title, description, keywords, noodp, creation_date, redirect =
match rows with
- | [id, title, description, creation_date, redirect ] ->
- id, title, description, creation_date, redirect
+ | [row] -> row
| _ -> assert false in
PGSQL(dbh)
where hostid = $hostid and id = $oldpageid";
PGSQL(dbh) "insert into pages (hostid, url, title,
- description, creation_date, logged_ip,
+ description, keywords, noodp,
+ creation_date, logged_ip,
logged_user, redirect, css)
- values ($hostid, $page, $title, $description,
+ values ($hostid, $page, $title, $description, $?keywords,
+ $?noodp,
$creation_date, $?logged_ip, $?logged_user,
$?redirect, $?css)";
let pageid = PGOCaml.serial4 dbh "pages_id_seq" in
PGSQL(dbh) "insert into contents (pageid, ordering,
- sectionname, content, divname, jsgo)
+ sectionname, content, divname, divclass,
+ jsgo)
select $pageid as pageid, ordering, sectionname,
- content, divname, jsgo
+ content, divname, divclass, jsgo
from contents
where pageid = $oldpageid";