(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: wikilib.ml,v 1.7 2004/09/25 16:05:03 rich Exp $
+ * $Id: wikilib.ml,v 1.10 2004/10/09 09:48:37 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
(* This matches any markup. *)
let markup_re =
let link = "\\[\\[\\s*(?:.+?)\\s*(?:\\|.+?\\s*)?\\]\\]" in
- let tag = "</?(?:b|i|strong|em|code|sup|sub|nowiki)>" in
+ let tag = "</?(?:b|i|strong|em|code|sup|sub|nowiki|br)>" in
Pcre.regexp ("(.*?)((?:" ^ link ^ ")|(?:" ^ tag ^ "))(.*)")
(* This matches links only, and should be compatible with the link contained
) else (
let title = url in
(* Look up the 'URL' against the titles in the database and
- * obtain the real URL. If none is found then it's a link to
- * create a new page.
+ * obtain the real URL.
*)
let sth = dbh#prepare_cached "select url from pages
where hostid = ? and url is not null
"/" ^ url, "internal", title
with
Not_found ->
- "/_bin/create_form.cmo?title=" ^ escape_url url, "newpage", title
+ (* It might be a template page ... These pages don't
+ * exist in the template, but can be synthesized on the
+ * fly by page.ml.
+ *)
+ let is_template_page url =
+ let sth = dbh#prepare_cached "select 1 from templates
+ where ? ~ url_regexp
+ order by ordering
+ limit 1" in
+ sth#execute [`String url];
+
+ try sth#fetch1int () = 1 with Not_found -> false
+ in
+
+ if is_template_page url then
+ "/" ^ url, "internal", title
+ else
+ (* No, it really doesn't exist, so make it a link to
+ * a new page.
+ *)
+ "/_bin/edit.cmo?title=" ^ escape_url url, "newpage", title
) in
"<a href=\"" ^ url ^
| FoundOpen (first, elem, rest) when elem = "nowiki" ->
(* handle <nowiki> specially ... *)
escape_html first :: loop (rest, elem :: [])
+ | FoundOpen (first, elem, rest) when elem = "br" ->
+ (* handle <br> specially ... *)
+ escape_html first :: "<br/>" :: loop (rest, [])
| FoundOpen (first, elem, rest) ->
(* open tag - push it onto the stack *)
escape_html first :: "<" :: elem :: ">" :: loop (rest, [elem])
| FoundOpen (first, elem, rest) when elem = "nowiki" ->
(* handle <nowiki> specially ... *)
escape_html first :: loop (rest, elem :: stack)
+ | FoundOpen (first, elem, rest) when elem = "br" ->
+ (* handle <br> specially ... *)
+ escape_html first :: "<br/>" :: loop (rest, stack)
| FoundOpen (first, elem, rest) ->
(* open tag - push it onto the stack *)
escape_html first :: "<" :: elem :: ">" ::