X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fwhat_links_here.ml;h=d904d0fd063c983069ff9b0e0bb431f7a0ceba33;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=80a7c4f236f6e2239955b41f742f39130072ab55;hpb=f249bda689881753ba729e48cce6ddf84ffeb3c2;p=cocanwiki.git

diff --git a/scripts/what_links_here.ml b/scripts/what_links_here.ml
index 80a7c4f..d904d0f 100644
--- a/scripts/what_links_here.ml
+++ b/scripts/what_links_here.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: what_links_here.ml,v 1.4 2004/10/10 14:44:50 rich Exp $
+ * $Id: what_links_here.ml,v 1.6 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
@@ -28,17 +28,16 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_links
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) dbh hostid _ _ =
   let template = get_template dbh hostid "what_links_here.html" in
 
   let page = q#param "page" in
   template#set "page" page;
 
-  let sth = dbh#prepare_cached "select title from pages
-                                 where hostid = ? and url = ?" in
-  sth#execute [`Int hostid; `String page];
-
-  let title = sth#fetch1string () in
+  let title = List.hd (
+    PGSQL(dbh) "select title from pages
+                 where hostid = $hostid and url = $page"
+  ) in
   template#set "title" title;
 
   let pages = what_links_here dbh hostid page in
@@ -53,11 +52,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   (* Is the page in the site menu?  If so, then every other page
    * links here, so we should say so.
    *)
-  let sth = dbh#prepare_cached "select 1 from sitemenu
-                                 where hostid = ? and url = ?" in
-  sth#execute [`Int hostid; `String page];
+  let rows = PGSQL(dbh)
+    "select 1 from sitemenu where hostid = $hostid and url = $page" in
 
-  let in_sitemenu = try sth#fetch1int () = 1 with Not_found -> false in
+  let in_sitemenu = rows = [Some 1l] in
   template#conditional "in_sitemenu" in_sitemenu;
 
   q#template template