X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fmail_import.ml;h=1c4f709b293f3c97e052876bb028a0699a0b2539;hb=aec0096a00df1b58b7a057618ad9f3baab7c846c;hp=19b107312cfbac6827c3588a8e7da8dd0fe40dd9;hpb=0b0fae5825c5cf6a9501d0164c9414046797df74;p=cocanwiki.git

diff --git a/scripts/mail_import.ml b/scripts/mail_import.ml
index 19b1073..1c4f709 100644
--- 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.
- * $Id: mail_import.ml,v 1.3 2004/10/11 16:07:25 rich Exp $
+ * $Id: mail_import.ml,v 1.5 2004/10/14 15:57:15 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
@@ -36,6 +36,7 @@ open Cocanwiki_template
 open Cocanwiki_date
 open Cocanwiki_strings
 open Cocanwiki_pages
+open Cocanwiki_mail
 
 let irt_re = Pcre.regexp "<.*?>"
 let ws_re = Pcre.regexp "\\s+"
@@ -57,8 +58,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
       upload.upload_value
     with
 	Not_found ->
-	  (* Force an error status which a script can detect. *)
-	  Request.set_status r cHTTP_BAD_REQUEST;
 	  error ~back_button:true ~title:"No message"
 	    q "No message was uploaded.";
 	  return () in
@@ -86,7 +85,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
    * cannot thread it, so give up.
    *)
   if date = "" || inet_message_id = "" then (
-    Request.set_status r cHTTP_BAD_REQUEST;
     error ~back_button:true ~title:"Headers missing"
       q "Date or Message-ID header missing.  Cannot handle this message. ";
     return ()
@@ -351,6 +349,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
    *)
   save_page dbh hostid ~user ~r model;
 
+  (* Rebuild threads? *)
+  if rebuild then
+    thread_mail dbh hostid date.Dbi.year date.Dbi.month;
+
   (* Commit to the database. *)
   dbh#commit ();