X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fsitemap.ml;h=182a0615d6bdb92f972ebbc00866ad85b5ad9c31;hb=bfa88724ee152ba00c2b2fca881dd78a6599820a;hp=4db9ed0b77c52068c5549998503f5ff3c496deae;hpb=d303f75eed3a09bbe2516d9a2a9a4aa9b862ceb3;p=cocanwiki.git

diff --git a/scripts/sitemap.ml b/scripts/sitemap.ml
index 4db9ed0..182a061 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.7 2004/10/04 15:19:56 rich Exp $
+ * $Id: sitemap.ml,v 1.8 2006/03/27 18:09:46 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,7 +29,7 @@ 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. *)
@@ -43,24 +43,24 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
                                  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];
+  sth#execute [Some hostid];
 
   let table =
     sth#map
-      (function [`String url; _; `String title; `String description;
+      (function [Some url; _; Some title; Some description;
 		 `Timestamp last_modified_date;
-		 (`Null | `String _) as content] ->
+		 (None | Some _) as content] ->
 	 let url = if url = "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 ->
+		  None -> ""
+		| Some c ->
 		    truncate 160
 		      (Wikilib.text_of_xhtml
 			 (Wikilib.xhtml_of_content dbh hostid c))) ]