Change subject line so it shows the name of the site.

[cocanwiki.git] / scripts / edit_sitemenu.ml

diff --git a/scripts/edit_sitemenu.ml b/scripts/edit_sitemenu.ml
index 676b0b3..6680e52 100644 (file)
--- a/scripts/edit_sitemenu.ml
+++ b/scripts/edit_sitemenu.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_sitemenu.ml,v 1.9 2005/11/24 14:54:11 rich Exp $
+ * $Id: edit_sitemenu.ml,v 1.11 2006/03/27 19:10:29 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
@@ -38,7 +38,7 @@ open Cocanwiki_strings
  *)
 type model_t = (string * string) list  (* label, url *)
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
+let run r (q : cgi) dbh hostid { hostname = hostname } user=
   let template = get_template dbh hostid "edit_sitemenu.html" in
 
   (* Workaround bugs in IE, specifically lack of support for <button>
@@ -54,16 +54,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   template#conditional "msie" msie;
 
   (* Pull in the list of URLs in useful format. *)
-  let sth = dbh#prepare_cached "select url, title from pages
-                                 where hostid = ?
-                                   and url is not null
-                                   and url <> 'index'
-                                 order by 2" in
-  sth#execute [`Int hostid];
-
-  let urls = sth#map (function [`String url; `String title] ->
-                       url, title
-                       | _ -> assert false) in
+  let urls = PGSQL(dbh)
+    "select url, title from pages
+      where hostid = $hostid
+        and url is not null
+        and url <> 'index'
+      order by 2" in
+  let urls = List.map (fun (url, title) -> Option.get url, title) urls in
 
   (* Build the internal model from the parameters passed to the script. *)
   let build_internal_model () =
@@ -177,15 +174,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
    * a model from it.
    *)
   let begin_editing () =
-    let sth = dbh#prepare_cached "select label, url, ordering
-                                    from sitemenu
-                                   where hostid = ?
-                                   order by ordering" in
-    sth#execute [`Int hostid];
+    let rows =
+      PGSQL(dbh) "select label, url, ordering
+                    from sitemenu
+                   where hostid = $hostid
+                   order by ordering" in
 
-    let model = sth#map (function [`String label; `String url; _] ->
-                          label, url
-                          | _ -> assert false) in
+    let model = List.map (fun (label, url, _) -> label, url) rows in
 
     model_to_template model template
   in
@@ -254,19 +249,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     if no_errors then (
       (* No errors, so we can save the page ... *)
 
-      let sth = dbh#prepare_cached "delete from sitemenu where hostid = ?" in
-      sth#execute [`Int hostid];
-
-      let sth = dbh#prepare_cached "insert into sitemenu (hostid, label, url,
-                                    ordering) values (?, ?, ?, ?)" in
-
-      List.iteri (fun i (label, url) ->
-                   let ordering = 10 * (i+1) in
-                   sth#execute [`Int hostid; `String label; `String url;
-                                `Int ordering]) model;
+      PGSQL(dbh) "delete from sitemenu where hostid = $hostid";
+      List.iteri (
+       fun i (label, url) ->
+         let ordering = Int32.of_int (10 * (i+1)) in
+         PGSQL(dbh)
+           "insert into sitemenu (hostid, label, url, ordering)
+             values ($hostid, $label, $url, $ordering)"
+      ) model;
 
       (* Commit changes to the database. *)
-      dbh#commit ();
+      PGOCaml.commit dbh;
 
       (* Email notification, if anyone is listed for this host. *)
       let subject = "The site menu has been edited" in