(* 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.42 2005/11/24 14:54:12 rich Exp $
+ * $Id: page.ml,v 1.47 2006/07/26 13:19:49 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
open Cocanwiki_server_settings
open Cocanwiki_links
-type fp_status = FPOK of int * string * string * Dbi.datetime * bool
+type fp_status = FPOK of int32 * string * string * Calendar.t * bool
| FPInternalRedirect of string
| FPExternalRedirect of string
| FPNotFound
let xhtml_re = Pcre.regexp "<.*?>|[^<>]+"
-let run r (q : cgi) (dbh : Dbi.connection) hostid
+let run r (q : cgi) dbh hostid
({ edit_anon = edit_anon; view_anon = view_anon } as host)
user =
let page = q#param "page" in
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, navigation
- from hosts where id = ?" in
- sth#execute [`Int hostid];
+ let rows = PGSQL(dbh)
+ "select css is not null, feedback_email is not null, mailing_list, navigation
+ from hosts where id = $hostid" in
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 navigation ] ->
+ match rows with
+ | [Some has_host_css, Some has_feedback_email,
+ mailing_list, navigation] ->
has_host_css, has_feedback_email, mailing_list, navigation
| _ -> assert false in
(* Check the templates table for extensions. *)
let get_extension url =
- let sth = dbh#prepare_cached "select extension from templates
- where ? ~ url_regexp
- order by ordering
- limit 1" in
- sth#execute [`String url];
-
try
- let name = sth#fetch1string () in
+ let name =
+ List.hd (
+ PGSQL(dbh) "select extension from templates
+ where $url ~ url_regexp
+ order by ordering
+ limit 1"
+ ) in
Some (List.assoc name !extensions)
with
- Not_found -> None
+ Not_found | ExtList.List.Empty_list -> None
in
(* This code generates ordinary pages. *)
| 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));
+ t#set "old_version" (Int32.to_string pageid);
+ th#set "old_version" (Int32.to_string 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;
+ ignore (print_string r th#to_string);
+ ignore (Request.rflush r);
t#conditional "has_feedback_email" has_feedback_email;
t#conditional "mailing_list" mailing_list;
match pageid with
None -> []
| Some pageid ->
- let sth = dbh#prepare_cached
- "select ordering, sectionname, content, divname
- from contents where pageid = ? order by ordering" in
- sth#execute [`Int pageid];
-
- sth#map
- (function [`Int ordering;
- (`Null | `String _) as sectionname;
- `String content;
- (`Null | `String _) as divname] ->
+ let rows = PGSQL(dbh)
+ "select ordering, sectionname, content, divname, jsgo
+ from contents where pageid = $pageid order by ordering" in
+
+ List.map
+ (fun (ordering, sectionname, content, divname, jsgo) ->
let divname, has_divname =
match divname with
- `Null -> "", false
- | `String divname -> divname, true in
+ | None -> "", false
+ | Some divname -> divname, true in
+ let jsgo, has_jsgo =
+ match jsgo with
+ | None -> "", false
+ | Some jsgo -> jsgo, true in
let sectionname, has_sectionname =
match sectionname with
- `Null -> "", false
- | `String sectionname -> sectionname, true in
+ | None -> "", false
+ | Some sectionname -> sectionname, true in
let linkname = linkname_of_sectionname sectionname in
- [ "ordering", Template.VarString (string_of_int ordering);
+ [ "ordering", Template.VarString (Int32.to_string ordering);
"has_sectionname",
Template.VarConditional has_sectionname;
"sectionname", Template.VarString sectionname;
Template.VarString
(Wikilib.xhtml_of_content dbh hostid content);
"has_divname", Template.VarConditional has_divname;
- "divname", Template.VarString divname ]
- | _ -> assert false) in
+ "divname", Template.VarString divname;
+ "has_jsgo", Template.VarConditional has_jsgo;
+ "jsgo", Template.VarString jsgo ]) rows in
(* Call an extension to generate the first section in this page? *)
let sections =
"content", Template.VarString content;
"has_divname", Template.VarConditional true;
"divname", Template.VarString "form_div";
+ "has_jsgo", Template.VarConditional false;
+ "jsgo", Template.VarString "";
] in
section :: sections in
t#conditional "user_logged_in" true;
t#set "username" username);
+ (* Can anonymous users create accounts? If not them we don't
+ * want to offer to create accounts for them.
+ *)
+ t#conditional "create_account_anon" host.create_account_anon;
+
(* If logged in, we want to update the recently_visited table. *)
if pageid <> None then (
match user with
| User (userid, _, _, _) ->
- let sth = dbh#prepare_cached "delete from recently_visited
- where hostid = ? and userid = ?
- and url = ?" in
- sth#execute [`Int hostid; `Int userid; `String page'];
- let sth = dbh#prepare_cached
- "insert into recently_visited (hostid, userid, url)
- values (?, ?, ?)" in
- sth#execute [`Int hostid; `Int userid; `String page'];
- dbh#commit ()
+ PGSQL(dbh)
+ "delete from recently_visited
+ where hostid = $hostid and userid = $userid and url = $page'";
+ PGSQL(dbh)
+ "insert into recently_visited (hostid, userid, url)
+ values ($hostid, $userid, $page')";
+ PGOCaml.commit dbh;
+ PGOCaml.begin_work dbh;
| _ -> ()
);
* links here' section, and don't link to self.
*)
let not_urls = page' :: wlh_urls in
- let limit = max_links - List.length wlh_urls in
- let qs = Dbi.placeholders (List.length not_urls) in
- let sth =
- dbh#prepare_cached
- ("select rv.url, p.title, rv.visit_time
- from recently_visited rv, pages p
- where rv.hostid = ? and rv.userid = ?
- and rv.url not in " ^ qs ^ "
- and rv.hostid = p.hostid and rv.url = p.url
- order by 3 desc
- limit ?") in
- let args = List.map (fun s -> `String s) not_urls in
- sth#execute
- ([`Int hostid; `Int userid] @ args @ [`Int limit]);
- sth#map
- (function [`String url; `String title; _] ->
- url, title
- | _ -> assert false)
+ let limit = Int32.of_int (max_links - List.length wlh_urls) in
+ let rows =
+ PGSQL(dbh)
+ "select rv.url, p.title, rv.visit_time
+ from recently_visited rv, pages p
+ where rv.hostid = $hostid and rv.userid = $userid
+ and rv.url not in $@not_urls
+ and rv.hostid = p.hostid and rv.url = p.url
+ order by 3 desc
+ limit $limit" in
+ List.map (
+ fun (url, title, _) -> url, title
+ ) rows
| _ -> [] in
(* Links to page. *)
match version with
| None ->
if allow_redirect then (
- let sth =
- dbh#prepare_cached
- "select url, redirect, id, title, description,
- last_modified_date, css is not null
- from pages where hostid = ? and lower (url) = lower (?)" in
- sth#execute [`Int hostid; `String page];
- (try
- (match sth#fetch1 () with
- | `String page' :: _ when page <> page' -> (* different case *)
- FPExternalRedirect page'
- | [ _; `Null; `Int id; `String title; `String description;
- `Timestamp last_modified_date; `Bool has_page_css ] ->
- FPOK (id, title, description, last_modified_date,
- has_page_css)
- | _ :: `String redirect :: _ ->
- FPInternalRedirect redirect
- | xs -> failwith (Dbi.sdebug xs))
- with
- Not_found -> FPNotFound)
+ let rows = PGSQL(dbh)
+ "select url, redirect, id, title, description,
+ last_modified_date, css is not null
+ from pages
+ where hostid = $hostid and lower (url) = lower ($page)" in
+ match rows with
+ | [Some page', _, _, _, _, _, _]
+ when page <> page' -> (* different case *)
+ FPExternalRedirect page'
+ | [ _, None, id, title, description,
+ last_modified_date, has_page_css ] ->
+ let has_page_css = Option.get has_page_css in
+ FPOK (id, title, description, last_modified_date,
+ has_page_css)
+ | [_, Some redirect, _, _, _, _, _] ->
+ FPInternalRedirect redirect
+ | [] -> FPNotFound
+ | _ -> assert false
) else (* redirects not allowed ... *) (
- let sth =
- dbh#prepare_cached
- "select id, title, description, last_modified_date,
- css is not null
- from pages where hostid = ? and url = ?" in
- sth#execute [`Int hostid; `String page];
- (try
- (match sth#fetch1 () with
- | [ `Int id; `String title; `String description;
- `Timestamp last_modified_date; `Bool has_page_css ] ->
- FPOK (id, title, description, last_modified_date,
- has_page_css)
- | xs -> failwith (Dbi.sdebug xs))
- with
- Not_found -> FPNotFound)
+ let rows = PGSQL(dbh)
+ "select id, title, description, last_modified_date,
+ css is not null
+ from pages where hostid = $hostid and url = $page" in
+ match rows with
+ | [ id, title, description,
+ last_modified_date, has_page_css ] ->
+ let has_page_css = Option.get has_page_css in
+ FPOK (id, title, description, last_modified_date,
+ has_page_css)
+ | [] -> FPNotFound
+ | _ -> assert false
)
| Some version ->
- let sth =
- dbh#prepare_cached
- "select id, title, description, last_modified_date,
- css is not null
- from pages
- where hostid = ? and id = ? and
- (url = ? or url_deleted = ?)" in
- sth#execute [`Int hostid; `Int version;
- `String page; `String page];
- (try
- (match sth#fetch1 () with
- | [ `Int id; `String title; `String description;
- `Timestamp last_modified_date; `Bool has_page_css ] ->
- FPOK (id, title, description, last_modified_date,
- has_page_css)
- | xs -> failwith (Dbi.sdebug xs))
- with
- Not_found -> FPNotFound)
+ let rows = PGSQL(dbh)
+ "select id, title, description, last_modified_date,
+ css is not null
+ from pages
+ where hostid = $hostid and id = $version and
+ (url = $page or url_deleted = $page)" in
+ match rows with
+ | [ id, title, description,
+ last_modified_date, has_page_css ] ->
+ let has_page_css = Option.get has_page_css in
+ FPOK (id, title, description, last_modified_date,
+ has_page_css)
+ | [] -> FPNotFound
+ | _ -> assert false
in
(* Here we deal with the complex business of redirects and versions. *)
let allow_redirect, version =
if can_edit then (
not (q#param_true "no_redirect"),
- try Some (int_of_string (q#param "version")) with Not_found -> None
+ try Some (Int32.of_string (q#param "version")) with Not_found -> None
) else
(true, None) in
| FPInternalRedirect page' ->
loop page' (i+1)
| FPExternalRedirect page' ->
- (* This normally happens when a user has request an uppercase
+ (* This normally happens when a user has requested an uppercase
* page name. We redirect to the true (lowercase) version.
*)
- q#redirect ("http://" ^ host.hostname ^ "/" ^ page');
- return ()
+ q#redirect ("http://" ^ host.hostname ^ "/" ^ page')
| FPNotFound ->
(* Might be a templated page with no content in it. *)
let extension = get_extension page' in
git.annexia.org / cocanwiki.git / blobdiff