X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fsitemap.ml;h=1aa8f24a279da3b33098fb5a7d99d0193f09d4c1;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=c5df8580bd43bb8b0cbce3a8232c198f0c283601;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/sitemap.ml b/scripts/sitemap.ml
index c5df858..1aa8f24 100644
--- a/scripts/sitemap.ml
+++ b/scripts/sitemap.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: sitemap.ml,v 1.6 2004/09/09 12:21:22 rich Exp $
+ * $Id: sitemap.ml,v 1.9 2006/03/28 16:24:08 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,42 +29,39 @@ open Cocanwiki_template
 open Cocanwiki_date
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   let template = get_template dbh hostid "sitemap.html" in
 
   (* Pull out all the current pages, and a bit of content from each. *)
-  let sth = dbh#prepare_cached "select p.url, p.url = 'index',
-                                       p.title, p.description,
-                                       p.last_modified_date,
-                                       (select content from contents
-                                         where pageid = p.id
-                                         order by ordering limit 1) as content
-                                  from pages p
-                                 where p.hostid = ? and p.url is not null
-                                   and p.redirect is null
-                                 order by 2 desc, 3, 1" in
-  sth#execute [`Int hostid];
+  let rows = PGSQL(dbh)
+    "select p.url, p.url = 'index', p.title, p.description,
+            p.last_modified_date, (select content from contents
+                                    where pageid = p.id
+                                    order by ordering limit 1) as content
+       from pages p
+      where p.hostid = $hostid and p.url is not null
+        and p.redirect is null
+      order by 2 desc, 3, 1" in
 
   let table =
-    sth#map
-      (function [`String url; _; `String title; `String description;
-		 `Timestamp last_modified_date;
-		 (`Null | `String _) as content] ->
-	 let url = if url = "index" then "" else url in
+    List.map
+      (function (Some url, Some is_index, title, description,
+		 last_modified_date, content) ->
+	 let url = if is_index then "" else url in
 	 let date = printable_date last_modified_date in
 	 [ "url", Template.VarString url;
 	   "title", Template.VarString title;
 	   "description", Template.VarString description;
 	   "last_modified_date", Template.VarString date;
-	   "has_content", Template.VarConditional (content <> `Null);
+	   "has_content", Template.VarConditional (content <> None);
 	   "content", Template.VarString
 	     (match content with
-		  `Null -> ""
-		| `String c ->
-		    truncate 160
-		      (Wikilib.text_of_xhtml
-			 (Wikilib.xhtml_of_content dbh hostid c))) ]
-	 | _ -> assert false) in
+	      | None -> ""
+	      | Some c ->
+		  truncate 160
+		    (Wikilib.text_of_xhtml
+		       (Wikilib.xhtml_of_content dbh hostid c))) ]
+       | _ -> assert false) rows in
 
   template#set "hostname" hostname;
   template#table "sitemap" table;
@@ -72,4 +69,4 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run