git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Asynchronous updates.
[cocanwiki.git]
/
scripts
/
mail_import.ml
diff --git
a/scripts/mail_import.ml
b/scripts/mail_import.ml
index
1c4f709
..
289e701
100644
(file)
--- a/
scripts/mail_import.ml
+++ b/
scripts/mail_import.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.
(* 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:1
5 rich Exp $
+ * $Id: mail_import.ml,v 1.
7 2004/12/01 13:55:5
5 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 program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-90,6
+90,10
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
return ()
);
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
(* Parse the date field. *)
let date, time =
try
@@
-188,7
+192,10
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
*)
msgid in
*)
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. *)
let title = sprintf "Mail/%s (%d)" subject msgid in
(* Choose a suitable URL. *)
@@
-291,7
+298,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
try
String.find (String.lowercase str) sub_lc
with
try
String.find (String.lowercase str) sub_lc
with
-
String.
Invalid_string -> -1
+ Invalid_string -> -1
in
let rec loop line = function
[] -> line
in
let rec loop line = function
[] -> line
@@
-313,9
+320,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
loop line links) lines in
let lines = List.map trim lines in
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
String.concat "\n" lines
in
@@
-351,7
+356,7
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
(* Rebuild threads? *)
if rebuild then
(* 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 ();
(* Commit to the database. *)
dbh#commit ();