+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / broken_links.ml

diff --git a/scripts/broken_links.ml b/scripts/broken_links.ml
index 901d555..17edcfa 100644 (file)
--- a/scripts/broken_links.ml
+++ b/scripts/broken_links.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: broken_links.ml,v 1.1 2004/10/09 16:25:08 rich Exp $
+ * $Id: broken_links.ml,v 1.3 2006/12/06 09:46: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
@@ -29,8 +29,8 @@ open Cocanwiki_template
 
 let keys h = Hashtbl.fold (fun key _ xs -> key :: xs) h []
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
-  let template = get_template dbh hostid "broken_links.html" in
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template r dbh hostid "broken_links.html" in
 
   (* The links table (to_url) field can now point to a non-existant
    * page.  It's from this observation that we are able to retrieve
@@ -38,11 +38,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
    * aren't broken links either because some of the content is
    * synthesized.
    *)
-  let sth =
-    dbh#prepare_cached
+  let rows =
+    PGSQL(dbh)
       "select l.from_url, p.title, l.to_url
          from links l, pages p
-        where l.hostid = ?
+        where l.hostid = $hostid
           and l.hostid = p.hostid and l.from_url = p.url
           and p.redirect is null
           and not exists (select id from pages
@@ -50,15 +50,15 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
           and not exists (select id from templates
                            where l.to_url ~ url_regexp)
         order by 3, 1 desc" in
-  sth#execute [`Int hostid];
 
   (* Group the links together. *)
   let h = Hashtbl.create 32 in
-  sth#iter (function [`String from_url; `String from_title; `String to_url] ->
-             let a = try Hashtbl.find h to_url with Not_found -> [] in
-             let a = (from_url, from_title) :: a in
-             Hashtbl.replace h to_url a
-             | _ -> assert false);
+  List.iter (
+    fun (from_url, from_title, to_url) ->
+      let a = try Hashtbl.find h to_url with Not_found -> [] in
+      let a = (from_url, from_title) :: a in
+      Hashtbl.replace h to_url a
+  ) rows;
 
   let keys = List.sort compare (keys h) in
   let table =