X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fadmin%2Fcreate_host.ml;h=9e1b62790d01a4cf91c3275bb9a3aeb55785bb97;hb=253dcc86ed026e18643f07559009b1d50ea5b800;hp=239e9cab1bdc83128d207481fb8fea9a9b698dd0;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/admin/create_host.ml b/scripts/admin/create_host.ml index 239e9ca..9e1b627 100644 --- a/scripts/admin/create_host.ml +++ b/scripts/admin/create_host.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: create_host.ml,v 1.3 2004/09/09 12:21:22 rich Exp $ + * $Id: create_host.ml,v 1.7 2004/10/06 10:34:30 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 @@ -29,6 +29,7 @@ open Cgi open Printf open Cocanwiki_strings +open Cocanwiki_create_host let split_re = Pcre.regexp "[\\s,;]+" @@ -62,25 +63,12 @@ let run r = let hostnames = List.map check_hostname hostnames in let hostnames = List.filter ((<>) "") hostnames in - (* Update the database. *) - let sth = dbh#prepare_cached - "set constraints \"hosts_hostname_cn\" deferred" in - sth#execute []; - let sth = dbh#prepare_cached "insert into hosts (canonical_hostname) - values (?)" in - sth#execute [`String canonical_hostname]; + let template = + if q#param_true "template" then int_of_string (q#param "template") + else 0 in - let hostid = sth#serial "hosts_id_seq" in - - let sth = dbh#prepare_cached "insert into hostnames (hostid, name) - values (?, ?)" in - sth#execute [`Int hostid; `String canonical_hostname]; - List.iter (fun name -> - sth#execute [`Int hostid; `String name]) hostnames; - - let sth = dbh#prepare_cached "insert into pages (hostid, url, title, - description) values (?, 'index', ?, ?)" in - sth#execute [`Int hostid; `String title; `String title]; + let hostid = create_host dbh canonical_hostname hostnames template title + "Administrator" "123456" true in (* Commit to the database. *) dbh#commit ();