(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: mail_import.ml,v 1.5 2004/10/14 15:57:15 rich Exp $
+ * $Id: mail_import.ml,v 1.6 2004/10/20 15:17:18 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
return ()
);
+ (* Can't handle funny characters in subject lines - remove them. *)
+ let subject = String.map (fun c ->
+ if Char.code c < 32 then ' ' else c) subject in
+
(* Parse the date field. *)
let date, time =
try
*)
msgid in
- (* The message is referred to by a unique title: *)
+ (* The message is referred to by a unique title.
+ * NB. Do not change this unique title - it is also used during thread
+ * indexing.
+ *)
let title = sprintf "Mail/%s (%d)" subject msgid in
(* Choose a suitable URL. *)
loop line links) lines in
let lines = List.map trim lines in
- let lines =
- List.map (fun line -> if line <> "" then line ^ " <br>" else "")
- lines in
+ let lines = List.map (fun line -> line ^ "<br>") lines in
String.concat "\n" lines
in
(* Rebuild threads? *)
if rebuild then
- thread_mail dbh hostid date.Dbi.year date.Dbi.month;
+ thread_mail dbh hostid ~user ~r date.Dbi.year date.Dbi.month;
(* Commit to the database. *)
dbh#commit ();