Added {{shell}} for running external shell commands.

[cocanwiki.git] / scripts / edit_page_css_form.ml

diff --git a/scripts/edit_page_css_form.ml b/scripts/edit_page_css_form.ml
index d58c641..cb48f54 100644 (file)
--- a/scripts/edit_page_css_form.ml
+++ b/scripts/edit_page_css_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.
- * $Id: edit_page_css_form.ml,v 1.7 2006/03/27 18:09:46 rich Exp $
+ * $Id: edit_page_css_form.ml,v 1.9 2006/12/06 09:46:57 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
@@ -28,19 +28,16 @@ open Cocanwiki
 open Cocanwiki_template
 
 let run r (q : cgi) dbh hostid _ _ =
-  let template = get_template dbh hostid "edit_page_css_form.html" in
+  let template = get_template r dbh hostid "edit_page_css_form.html" in
 
   let page = q#param "page" in
 
-  let sth = dbh#prepare_cached "select css from pages
-                                 where hostid = ? and url = ?" in
-  sth#execute [Some hostid; Some page];
+  let css = List.hd (
+    PGSQL(dbh) "select css from pages
+                 where hostid = $hostid and url = $page"
+  ) in
 
-  let css =
-    match sth#fetch1 () with
-      | [ None ] -> ""
-      | [ Some css ] -> css
-      | _ -> assert false in
+  let css = match css with None -> "" | Some css -> css in
 
   template#set "page" page;
   template#set "css" css;