Fix for ExtLib 1.3.

diff --git a/scripts/edit.ml b/scripts/edit.ml
index 2e9ee50..893a17f 100644 (file)
--- a/scripts/edit.ml
+++ b/scripts/edit.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: edit.ml,v 1.24 2004/11/01 12:57:53 rich Exp $
+ * $Id: edit.ml,v 1.25 2004/12/01 13:55:55 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
@@ -48,7 +48,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
       ignore (String.find ua "MSIE"); (* Throws Invalid_string if not found. *)
       true
     with
-       Not_found | String.Invalid_string -> false in
+       Not_found | Invalid_string -> false in
   template#conditional "msie" msie;
 
   (* Build the internal model from the parameters passed to the script. *)

diff --git a/scripts/edit_sitemenu.ml b/scripts/edit_sitemenu.ml
index c283178..f4986ca 100644 (file)
--- a/scripts/edit_sitemenu.ml
+++ b/scripts/edit_sitemenu.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: edit_sitemenu.ml,v 1.7 2004/11/03 11:15:45 rich Exp $
+ * $Id: edit_sitemenu.ml,v 1.8 2004/12/01 13:55:55 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
@@ -50,7 +50,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
       ignore (String.find ua "MSIE"); (* Throws Invalid_string if not found. *)
       true
     with
-       Not_found | String.Invalid_string -> false in
+       Not_found | Invalid_string -> false in
   template#conditional "msie" msie;
 
   (* Pull in the list of URLs in useful format. *)

diff --git a/scripts/file.ml b/scripts/file.ml
index 4345b11..aafb144 100644 (file)
--- a/scripts/file.ml
+++ b/scripts/file.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: file.ml,v 1.12 2004/11/01 16:24:32 rich Exp $
+ * $Id: file.ml,v 1.13 2004/12/01 13:55:55 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
@@ -62,7 +62,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
       try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
     let ok =
       try String.find referer hostname; true
-      with String.Invalid_string -> false in
+      with Invalid_string -> false in
 
     if not ok then (
       prerr_endline "file.ml: bandwidth theft avoided";

diff --git a/scripts/image.ml b/scripts/image.ml
index cad2ceb..66cd062 100644 (file)
--- a/scripts/image.ml
+++ b/scripts/image.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: image.ml,v 1.13 2004/11/01 16:24:32 rich Exp $
+ * $Id: image.ml,v 1.14 2004/12/01 13:55:55 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
@@ -64,7 +64,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
       try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
     let ok =
       try String.find referer hostname; true
-      with String.Invalid_string -> false in
+      with Invalid_string -> false in
 
     if not ok then (
       prerr_endline "image.ml: bandwidth theft avoided";

diff --git a/scripts/lib/cocanwiki_strings.ml b/scripts/lib/cocanwiki_strings.ml
index a2071a8..7939e74 100644 (file)
--- a/scripts/lib/cocanwiki_strings.ml
+++ b/scripts/lib/cocanwiki_strings.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: cocanwiki_strings.ml,v 1.1 2004/10/21 11:42:05 rich Exp $
+ * $Id: cocanwiki_strings.ml,v 1.2 2004/12/01 13:55:55 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
@@ -23,7 +23,7 @@ open ExtString
 
 let string_contains substr str =
   try String.find str substr; true
-  with String.Invalid_string -> false
+  with Invalid_string -> false
 
 let string_of_char = String.make 1
 

diff --git a/scripts/mail_import.ml b/scripts/mail_import.ml
index 9e30fc9..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.
- * $Id: mail_import.ml,v 1.6 2004/10/20 15:17:18 rich Exp $
+ * $Id: mail_import.ml,v 1.7 2004/12/01 13:55:55 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
@@ -298,7 +298,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
               try
                 String.find (String.lowercase str) sub_lc
               with
-                  String.Invalid_string -> -1
+                  Invalid_string -> -1
             in
             let rec loop line = function
                 [] -> line