Very primitive, but working, RSS feeds.

[cocanwiki.git] / scripts / edit.ml

diff --git a/scripts/edit.ml b/scripts/edit.ml
index 0d22746..bf7b482 100644 (file)
--- a/scripts/edit.ml
+++ b/scripts/edit.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.ml,v 1.5 2004/09/08 13:09:05 rich Exp $
+ * $Id: edit.ml,v 1.9 2004/09/20 10:56:47 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
@@ -18,9 +33,6 @@ open Cocanwiki_emailnotify
 open Cocanwiki_diff
 open Cocanwiki_strings
 
-let template = get_template "edit.html"
-let template_conflict = get_template "edit_conflict.html"
-
 (* We keep an "internal model" of the page - see build_internal_model ()
  * below.
  *)
@@ -33,7 +45,10 @@ type model_t = {
                                         * for each section. *)
 }
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+  let template = get_template dbh hostid "edit.html" in
+  let template_conflict = get_template dbh hostid "edit_conflict.html" in
+
   (* Workaround bugs in IE, specifically lack of support for <button>
    * elements.
    *)
@@ -103,12 +118,16 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
                   "(ie. not to a page which is itself a redirect).")
     );
 
-    (* All sections have sectionnames? *)
-    List.iter (function (sectionnames, _, _)
-                  when string_is_whitespace sectionnames ->
-                    add_error ("Every section must have a title.");
-                | _ -> ())
-      model.contents;
+    (* All sections after the first one have sectionnames?  The first
+     * section ONLY is allowed to have an empty title.
+     *)
+    if model.contents <> [] then
+      List.iter (function (sectionnames, _, _)
+                    when string_is_whitespace sectionnames ->
+                      add_error
+                      ("Every section except the first must have a title.");
+                  | _ -> ())
+       (List.tl model.contents);
 
     get_errors ()
   in
@@ -232,7 +251,8 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
        | _ -> assert false in
 
     (* Get the sections. *)
-    let sth = dbh#prepare_cached "select sectionname, content,
+    let sth = dbh#prepare_cached "select coalesce (sectionname, ''),
+                                         content,
                                          coalesce (divname, '')
                                     from contents
                                    where pageid = ?
@@ -414,9 +434,12 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
                   let divname =
                     if string_is_whitespace divname then `Null
                     else `String divname in
+                  let sectionname =
+                    if string_is_whitespace sectionname then `Null
+                    else `String sectionname in
                   incr ordering; let ordering = !ordering in
                   sth#execute [`Int pageid; `Int ordering;
-                               `String sectionname; divname;
+                               sectionname; divname;
                                `String content])
        model.contents;