X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fedit_page_css.ml;h=a79b65f8b0225ad20709a75a2c9293651dfbb161;hb=03c84f3c8e3ed31fd4026cab659ff274ef157212;hp=aafbf630c5336f1ce5dd74c83e3e214e82af5418;hpb=2fb2827e6f832d9a7987043c480cfe2288a881bc;p=cocanwiki.git

diff --git a/scripts/edit_page_css.ml b/scripts/edit_page_css.ml
index aafbf63..a79b65f 100644
--- a/scripts/edit_page_css.ml
+++ b/scripts/edit_page_css.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: edit_page_css.ml,v 1.21 2006/07/26 13:41:37 rich Exp $
+ * $Id: edit_page_css.ml,v 1.22 2006/08/04 12:45: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
@@ -50,14 +50,13 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
    * us to revert changes to the CSS easily.
    *)
   let rows = PGSQL(dbh)
-    "select id, title, description, creation_date, redirect
+    "select id, title, description, keywords, creation_date, redirect
        from pages
       where hostid = $hostid and url = $page" in
 
-  let oldpageid, title, description, creation_date, redirect =
+  let oldpageid, title, description, keywords, 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)
@@ -69,9 +68,10 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
                where hostid = $hostid and id = $oldpageid";
 
   PGSQL(dbh) "insert into pages (hostid, url, title,
-                                 description, creation_date, logged_ip,
+                                 description, keywords,
+                                 creation_date, logged_ip,
                                  logged_user, redirect, css)
-              values ($hostid, $page, $title, $description,
+              values ($hostid, $page, $title, $description, $?keywords,
                       $creation_date, $?logged_ip, $?logged_user,
                       $?redirect, $?css)";