Bumped release for roll live.

[cocanwiki.git] / scripts / page.ml

diff --git a/scripts/page.ml b/scripts/page.ml
index 70c25b3..b219afa 100644 (file)
--- a/scripts/page.ml
+++ b/scripts/page.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: page.ml,v 1.12 2004/09/17 15:24:54 rich Exp $
+ * $Id: page.ml,v 1.13 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
@@ -94,13 +94,20 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
 
     let sections =
       sth#map
-       (function [`Int ordering; `String sectionname; `String content;
+       (function [`Int ordering;
+                  (`Null | `String _) as sectionname;
+                  `String content;
                   (`Null | `String _) as divname] ->
           let divname, has_divname =
             match divname with
                 `Null -> "", false
               | `String divname -> divname, true in
+          let sectionname, has_sectionname =
+            match sectionname with
+                `Null -> "", false
+              | `String sectionname -> sectionname, true in
           [ "ordering", Template.VarString (string_of_int ordering);
+            "has_sectionname", Template.VarConditional has_sectionname;
             "sectionname", Template.VarString sectionname;
             "content",
               Template.VarString