Fixed up to work with mod_caml 1.3.0-2.

[cocanwiki.git] / scripts / cocanwiki.ml

diff --git a/scripts/cocanwiki.ml b/scripts/cocanwiki.ml
index 96cef37..037c654 100644 (file)
--- a/scripts/cocanwiki.ml
+++ b/scripts/cocanwiki.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.ml,v 1.10 2004/09/23 11:51:17 rich Exp $
+ * $Id: cocanwiki.ml,v 1.13 2004/09/27 12:37:54 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
@@ -34,47 +34,6 @@ module Pool = DbiPool (Dbi_postgres)
  *)
 let _get_dbh r = Pool.get r "cocanwiki"
 
-(* Server-wide settings.
- *
- * These are stored in a single row in the database in the table
- * 'server_settings'.  You must restart the server if you change
- * this row.
- *
- * It's not possible to read these at server start-up time because the
- * Apache server is still running as 'root' and will not normally be
- * allowed to access the database.  We thus read them at the earliest
- * opportunity, in a request context, and cache the results.
- *)
-let server_settings_version =
-  let settings = ref None in
-  let get_settings (dbh : Dbi.connection) =
-    let sth = dbh#prepare "select version from server_settings" in
-    sth#execute [];
-    let s =
-      match sth#fetch1 () with
-       | [ `Int version ] -> version
-       | _ -> assert false in
-    sth#finish ();
-    settings := Some s;
-    s
-  in
-
-  let server_settings_version dbh =
-    let (version) =
-      match !settings with
-         None -> get_settings dbh
-       | Some settings -> settings in
-    version
-  in
-
-  server_settings_version
-
-(* The [CgiExit] exception should be folded back into the base
- * mod_caml code at some point.  It just causes the 'run' function to
- * return at that point safely.  (XXX)
- *)
-exception CgiExit
-
 (* Permissions and restrictions.
  *
  * Use the optional ~restrict parameter to register_script to restrict
@@ -228,10 +187,7 @@ let register_script ?(restrict = []) ?(anonymous = true) run =
 
        if permitted then (
         (* Call the actual CGI script. *)
-        try
-          run r q dbh hostid host user
-        with
-            CgiExit -> ()
+        run r q dbh hostid host user
        ) else
         error ~back_button:true
           ~title:"Access denied"