Commented a bug.

[cocanwiki.git] / scripts / lib / cocanwiki_template.ml

diff --git a/scripts/lib/cocanwiki_template.ml b/scripts/lib/cocanwiki_template.ml
index 524255b..a90b614 100644 (file)
--- a/scripts/lib/cocanwiki_template.ml
+++ b/scripts/lib/cocanwiki_template.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: cocanwiki_template.ml,v 1.2 2004/10/23 10:13:20 rich Exp $
+ * $Id: cocanwiki_template.ml,v 1.3 2004/11/03 13:36:45 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
@@ -83,20 +83,24 @@ let get_template ?page (dbh : Dbi.connection) hostid filename =
   (* Get standard fields concerning this host from the database. *)
   let sth =
     dbh#prepare_cached
-      "select h.theme_css, p.name, p.url
+      "select h.theme_css, p.name, p.url, h.search_box,
+              h.brand, h.brand_tagline, h.brand_description
          from hosts h left outer join powered_by p on h.powered_by = p.id
         where h.id = ?" in
   sth#execute [`Int hostid];
 
-  let theme_css, powered_by_name, powered_by_url =
+  let theme_css, powered_by_name, powered_by_url, search_box,
+      brand, brand_tagline, brand_description =
     match sth#fetch1 () with
-      | [ a; b; c] -> a, b, c
+      | [ a; b; c; d; e; f; g] -> a, b, c, d, e, f, g
       | _ -> assert false in
+
   let theme_css =
     match theme_css with
       | `Null -> "/_css/standard.css"
       | `String file -> file
       | _ -> assert false in
+
   let powered_by_name, powered_by_url =
     match powered_by_name, powered_by_url with
       | `Null, `Null ->
@@ -107,9 +111,39 @@ let get_template ?page (dbh : Dbi.connection) hostid filename =
       | `String name, `String url -> name, url
       | _ -> assert false in
 
+  let search_box = match search_box with `Bool b -> b | _ -> assert false in
+
+  let branding, brand,
+      has_brand_tagline, brand_tagline,
+      has_brand_description, brand_description =
+    match brand with
+      | `Null -> false, "", false, "", false, ""
+      | `String brand ->
+         let has_brand_tagline, brand_tagline =
+           match brand_tagline with
+             | `Null -> false, ""
+             | `String s -> true, s
+             | _ -> assert false in
+         let has_brand_description, brand_description =
+           match brand_description with
+             | `Null -> false, ""
+             | `String s -> true, s
+             | _ -> assert false in
+         true, brand,
+           has_brand_tagline, brand_tagline,
+           has_brand_description, brand_description
+      | _ -> assert false in
+
   template#set "theme_css" theme_css;
   template#set "powered_by_name" powered_by_name;
   template#set "powered_by_url" powered_by_url;
+  template#conditional "search_box" search_box;
+  template#conditional "branding" branding;
+  template#set "brand" brand;
+  template#conditional "has_brand_tagline" has_brand_tagline;
+  template#set "brand_tagline" brand_tagline;
+  template#conditional "has_brand_description" has_brand_description;
+  template#set "brand_description" brand_description;
 
   (* Site menu. *)
   let sth = dbh#prepare_cached "select url, label, ordering from sitemenu
@@ -138,10 +172,6 @@ let get_template ?page (dbh : Dbi.connection) hostid filename =
 
   template#table "sitemenu" table;
 
-  (* Wiki version. *)
-  template#set "cocanwiki_package" Cocanwiki_version.package;
-  template#set "cocanwiki_version" Cocanwiki_version.version;
-
   (* Copyright year. *)
   template#set "year" (string_of_int year);