X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fedit_host_css_form.ml;h=945d5c87b49394ade8144b3e2f3a44fd0563d7a7;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=aac3e5804725b81a508fa2a0bf9649accec4cf50;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/admin/edit_host_css_form.ml b/scripts/admin/edit_host_css_form.ml
index aac3e58..945d5c8 100644
--- a/scripts/admin/edit_host_css_form.ml
+++ b/scripts/admin/edit_host_css_form.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: edit_host_css_form.ml,v 1.4 2004/09/09 09:35:35 rich Exp $
+ * $Id: edit_host_css_form.ml,v 1.7 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -14,18 +29,18 @@ open Cocanwiki_template
 
 let template = _get_template "admin/edit_host_css_form.html"
 
-let run r (q : cgi) (dbh : Dbi.connection) _ _ _ =
-  let hostid = int_of_string (q#param "hostid") in
-  template#set "id" (string_of_int hostid);
+let run r (q : cgi) dbh _ _ _ =
+  let hostid = Int32.of_string (q#param "hostid") in
+  template#set "id" (Int32.to_string hostid);
 
-  let sth = dbh#prepare_cached "select css from hosts where id = ?" in
-  sth#execute [`Int hostid];
+  let css = List.hd (
+    PGSQL(dbh) "select css from hosts where id = $hostid"
+  ) in
 
   let css =
-    match sth#fetch1 () with
-      | [ `Null ] -> ""
-      | [ `String css ] -> css
-      | _ -> assert false in
+    match css with
+      | None -> ""
+      | Some css -> css in
 
   template#set "css" css;