Global replace 'raise CgiExit' -> 'return ()' to match a future version of mod_caml.

[cocanwiki.git] / scripts / create.ml

diff --git a/scripts/create.ml b/scripts/create.ml
index 3da0560..4b4caa6 100644 (file)
--- a/scripts/create.ml
+++ b/scripts/create.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: create.ml,v 1.4 2004/09/09 09:35:33 rich Exp $
+ * $Id: create.ml,v 1.8 2004/09/23 11:56:47 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -15,7 +30,7 @@ open Cocanwiki
 open Cocanwiki_emailnotify
 open Cocanwiki_ok
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   (* Get the page title. *)
   let title = q#param "title" in
 
@@ -25,10 +40,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       | Wikilib.GenURL_TooShort | Wikilib.GenURL_BadURL ->
          error ~back_button:true ~title:"Bad page name"
            q "The page name supplied is too short or invalid.";
-         raise CgiExit
+         return ()
       | Wikilib.GenURL_Duplicate url ->
          q#redirect ("http://" ^ hostname ^ "/" ^ url);
-         raise CgiExit in
+         return () in
 
   (* Description field must contain something. *)
   let description = q#param "description" in
@@ -36,7 +51,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     error ~back_button:true ~title:"Description field missing"
       q "You must write a brief description for search engines and
          directories.";
-    raise CgiExit
+    return ()
   );
 
   (* Get the IP address of the user, if available. *)
@@ -44,22 +59,26 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     try `String (Connection.remote_ip (Request.connection r))
     with Not_found -> `Null in
 
+  let logged_user =
+    match user with
+      | User (id, _, _) -> `Int id
+      | _ -> `Null in
+
   (* Create the page. *)
   let sth = dbh#prepare_cached "insert into pages (hostid, url, title,
-                                  description, logged_ip)
-                                values (?, ?, ?, ?, ?)" in
+                                  description, logged_ip, logged_user)
+                                values (?, ?, ?, ?, ?, ?)" in
   sth#execute [`Int hostid; `String url; `String title; `String description;
-              logged_ip];
+              logged_ip; logged_user];
 
   let pageid = sth#serial "pages_id_seq" in
 
   (* Create a single section. *)
-  let sectionname = "Section title - change this" in
   let content = "Write some content here." in
 
   let sth = dbh#prepare_cached "insert into contents (pageid, ordering,
                                   sectionname, content) values (?, 1, ?, ?)" in
-  sth#execute [`Int pageid; `String sectionname; `String content];
+  sth#execute [`Int pageid; `Null; `String content];
 
   (* Commit. *)
   dbh#commit ();