COCANWIKI is now ~95% UTF-8 safe.

[cocanwiki.git] / scripts / mail_import.ml

diff --git a/scripts/mail_import.ml b/scripts/mail_import.ml
index 44d2b41..582f104 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.
- * $Id: mail_import.ml,v 1.13 2006/07/26 13:41:37 rich Exp $
+ * $Id: mail_import.ml,v 1.15 2006/08/16 15:27:02 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
@@ -197,7 +197,7 @@ let run r (q : cgi) dbh hostid _ user =
 
   (* Choose a suitable URL. *)
   let url =
-    match Wikilib.generate_url_of_title dbh hostid title with
+    match Wikilib.generate_url_of_title r dbh hostid title with
        (* Duplicate URL is OK - eg. in the case where we are overwriting
         * an already imported message.
         *)
@@ -293,7 +293,7 @@ let run r (q : cgi) dbh hostid _ user =
          (fun line ->
             let find str sub_lc =
               try
-                String.find (String.lowercase str) sub_lc
+                String.find (lowercase str) sub_lc
               with
                   Invalid_string -> -1
             in
@@ -349,11 +349,11 @@ let run r (q : cgi) dbh hostid _ user =
    * them because we want to script to fail abruptly if any of these
    * unexpected conditions arises.
    *)
-  ignore (save_page dbh hostid ~user ~r model);
+  ignore (save_page r dbh hostid ~user model);
 
   (* Rebuild threads? *)
   if rebuild then
-    thread_mail dbh hostid ~user ~r
+    thread_mail r dbh hostid ~user
       (Calendar.year (fst message_date))
       (Date.int_of_month (Calendar.month (fst message_date)));