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

diff --git a/scripts/what_links_here.ml b/scripts/what_links_here.ml
index ea9b572..80a7c4f 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.1 2004/09/28 11:51:38 rich Exp $
+ * $Id: what_links_here.ml,v 1.4 2004/10/10 14:44:50 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
@@ -26,6 +26,7 @@ open Printf
 
 open Cocanwiki
 open Cocanwiki_template
+open Cocanwiki_links
 
 let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let template = get_template dbh hostid "what_links_here.html" in
@@ -40,22 +41,26 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let title = sth#fetch1string () in
   template#set "title" title;
 
-  let sth =
-    dbh#prepare_cached "select l.from_url, p.title from links l, pages p
-                         where l.hostid = ? and l.to_url = ?
-                           and l.hostid = p.hostid and l.from_url = p.url" in
-  sth#execute [`Int hostid; `String page];
-
+  let pages = what_links_here dbh hostid page in
   let table =
-    sth#map
-      (function [`String page; `String title] ->
-	 [ "page", Template.VarString page;
-	   "title", Template.VarString title ]
-	 | _ -> assert false) in
+    List.map (fun (page, title) ->
+		[ "page", Template.VarString page;
+		  "title", Template.VarString title ]) pages in
 
   template#table "pages" table;
+  template#conditional "pages_empty" (table = []);
+
+  (* 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 in_sitemenu = try sth#fetch1int () = 1 with Not_found -> false in
+  template#conditional "in_sitemenu" in_sitemenu;
 
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run