X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fsearch.ml;h=bf27600a4ca2cecf01a4a9301a733f869348c86a;hb=4b281fea34f35536bff368f825c7a661e21c132b;hp=369afcf04bfaadb0dd21ca38a37f990fbfbebbf6;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git diff --git a/scripts/search.ml b/scripts/search.ml index 369afcf..bf27600 100644 --- a/scripts/search.ml +++ b/scripts/search.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: search.ml,v 1.1 2004/09/07 10:14:09 rich Exp $ + * $Id: search.ml,v 1.5 2004/10/04 15:19:56 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 let search : ('a -> 'b -> 'c, unit, string, string) format4 = "http://www.google.com/search?q=site:%s+%s" -let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname) _ = +let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = let query = q#param "q" in let query = sprintf search (escape_url hostname) (escape_url query) in @@ -23,4 +38,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname) _ = q#redirect query let () = - register_script run + register_script ~restrict:[CanView] run