X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=b82c7ccdc46b7c19370be2066888af597f1cf4f4;hb=89e8d5757ca111d16ce3dfcc1ce4f2c00a119c85;hp=67ac47c3589889e5e831dc460393b19c4984b1cb;hpb=c5f822d1ca81042a8c0be2955668b0abebf1b11c;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 67ac47c..b82c7cc 100644 --- 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.37 2004/10/30 10:16:10 rich Exp $ + * $Id: page.ml,v 1.39 2004/11/05 11:35:53 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 @@ -59,21 +59,33 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let page = q#param "page" in let page = if page = "" then "index" else page in + (* The main "page" template is split in two to improve the speed of + * delivery of the page. The very first part ("page_header.html") + * contains the page , crucially including all the links to the + * stylesheets. We send this first and flush it out to the client so + * that the client can begin requesting stylesheets, background images + * and so on. After this we compose the main page ("page.html") and + * send it out second. + *) + + let template_page_header = + get_template ~page dbh hostid "page_header.html" in let template_page = get_template ~page dbh hostid "page.html" in + + (* This is the simpler template for 404 pages. *) let template_404 = get_template dbh hostid "page_404.html" in (* Host-specific fields. *) let sth = dbh#prepare_cached "select css is not null, feedback_email is not null, - mailing_list, search_box, navigation + mailing_list, navigation from hosts where id = ?" in sth#execute [`Int hostid]; - let has_host_css, has_feedback_email, mailing_list, search_box, navigation = + let has_host_css, has_feedback_email, mailing_list, navigation = match sth#fetch1 () with | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list; - `Bool search_box; `Bool navigation ] -> - has_host_css, has_feedback_email, mailing_list, search_box, - navigation + `Bool navigation ] -> + has_host_css, has_feedback_email, mailing_list, navigation | _ -> assert false in (* User permissions. *) @@ -172,30 +184,52 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let make_page title description pageid last_modified_date has_page_css version page page' extension = let t = template_page in + let th = template_page_header in t#set "title" title; + th#set "title" title; t#set "last_modified_date" last_modified_date; (match description with - None -> t#conditional "has_description" false + None -> th#conditional "has_description" false | Some description -> - t#conditional "has_description" true; - t#set "description" description); + th#conditional "has_description" true; + th#set "description" description); if page <> page' then (* redirection *) ( t#set "page" page'; + th#set "page" page'; t#set "original_page" page; (* XXX title - get it from database *) t#conditional "redirected" true ) else ( t#set "page" page; + th#set "page" page; t#conditional "redirected" false ); - t#conditional "has_host_css" has_host_css; - t#conditional "has_page_css" has_page_css; + th#conditional "has_host_css" has_host_css; + th#conditional "has_page_css" has_page_css; + + (* Are we showing an old version of the page? If so, warn. *) + (match version with + None -> + t#conditional "is_old_version" false; + th#conditional "is_old_version" false + | Some pageid -> + t#conditional "is_old_version" true; + th#conditional "is_old_version" true; + t#set "old_version" (string_of_int pageid); + th#set "old_version" (string_of_int pageid)); + + (* At this point, we can print out the header and flush it back to + * the user, allowing the browser to start fetching stylesheets + * and background images while we compose the page. + *) + q#header (); + print_string r th#to_string; + Request.rflush r; t#conditional "has_feedback_email" has_feedback_email; t#conditional "mailing_list" mailing_list; - t#conditional "search_box" search_box; t#conditional "navigation" navigation; t#conditional "can_edit" can_edit; @@ -256,14 +290,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid t#table "sections" sections; - (* Are we showing an old version of the page? If so, warn. *) - (match version with - None -> - t#conditional "is_old_version" false - | Some pageid -> - t#conditional "is_old_version" true; - t#set "old_version" (string_of_int pageid)); - (* Login status. *) (match user with Anonymous -> @@ -353,12 +379,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let xhtml = highlight_search_terms xhtml search_terms "search_term" in (* Deliver the page. *) - q#header (); ignore (print_string r xhtml) with Not_found -> (* No referer / no search terms / not a search engine referer. *) - q#template t + ignore (print_string r t#to_string) in (* This code generates 404 pages. *)