X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=9a4e8da5679136b51dd25a91c55cab1c152ed0bb;hb=5b036c1119e5871a8996c98639cd861ea7d93e75;hp=7e2f02d6ac0fbe85407a0e2c52b149d979d35cb7;hpb=ae40d142ea634f9bd4e64f4f5d333021eefaf05b;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 7e2f02d..9a4e8da 100644
--- a/scripts/page.ml
+++ b/scripts/page.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: page.ml,v 1.26 2004/10/07 16:54:24 rich Exp $
+ * $Id: page.ml,v 1.28 2004/10/10 16:14:43 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
@@ -31,9 +31,7 @@ open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_date
 open Cocanwiki_server_settings
-
-(* Maximum level of redirection. *)
-let max_redirect = 4
+open Cocanwiki_links
 
 type fp_status = FPOK of int * string * string * Dbi.datetime * bool
 	       | FPRedirect of string
@@ -66,14 +64,15 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
   (* Host-specific fields. *)
   let sth = dbh#prepare_cached "select css is not null,
                                        feedback_email is not null,
-                                       mailing_list, search_box
+                                       mailing_list, search_box, navigation
                                   from hosts where id = ?" in
   sth#execute [`Int hostid];
-  let has_host_css, has_feedback_email, mailing_list, search_box =
+  let has_host_css, has_feedback_email, mailing_list, search_box, navigation =
     match sth#fetch1 () with
       | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list;
-	  `Bool search_box ] ->
-	  has_host_css, has_feedback_email, mailing_list, search_box
+	  `Bool search_box; `Bool navigation ] ->
+	  has_host_css, has_feedback_email, mailing_list, search_box,
+	  navigation
       | _ -> assert false in
 
   (* Can the user edit?  Manage users?  etc. *)
@@ -199,6 +198,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
     t#conditional "has_feedback_email" has_feedback_email;
     t#conditional "mailing_list" mailing_list;
     t#conditional "search_box" search_box;
+    t#conditional "navigation" navigation;
 
     t#conditional "can_edit" can_edit;
     t#conditional "can_manage_users" can_manage_users;
@@ -278,6 +278,64 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 	   t#conditional "user_logged_in" true;
 	   t#set "username" username);
 
+    (* If logged in, we want to update the recently_visited table. *)
+    (match user with
+       | User (userid, _, _) ->
+	   let sth = dbh#prepare_cached "delete from recently_visited
+                                          where hostid = ? and userid = ?
+                                            and url = ?" in
+	   sth#execute [`Int hostid; `Int userid; `String page'];
+	   let sth = dbh#prepare_cached
+		       "insert into recently_visited (hostid, userid, url)
+                        values (?, ?, ?)" in
+	   sth#execute [`Int hostid; `Int userid; `String page'];
+	   dbh#commit ()
+       | _ -> ());
+
+    (* Navigation links. *)
+    if navigation then (
+      let max_links = 15 in		(* Show no more links than this. *)
+
+      (* What links here. *)
+      let wlh = what_links_here dbh hostid page' in
+      let wlh_urls = List.map fst wlh in (* Just the URLs ... *)
+
+      let rv =
+	match user with
+	  | User (userid, _, _) ->
+	      (* Recently visited URLs, but don't repeat any from the 'what
+	       * links here' section, and don't link to self.
+	       *)
+	      let not_urls = page' :: wlh_urls in
+	      let qs = Dbi.placeholders (List.length not_urls) in
+	      let sth =
+		dbh#prepare_cached
+		  ("select rv.url, p.title, rv.visit_time
+                      from recently_visited rv, pages p
+                     where rv.hostid = ? and rv.userid = ?
+                       and rv.url not in " ^ qs ^ "
+                       and rv.hostid = p.hostid and rv.url = p.url
+                     order by 3 desc
+                     limit ?") in
+	      let args = List.map (fun s -> `String s) not_urls in
+	      sth#execute
+		([`Int hostid; `Int userid] @ args @ [`Int max_links]);
+	      sth#map
+		(function [`String url; `String title; _] ->
+		   url, title
+		   | _ -> assert false)
+	  | _ -> [] in
+
+      (* Links to page. *)
+      let f (page, title) = [ "page", Template.VarString page;
+			      "title", Template.VarString title ] in
+      let table = List.map f wlh in
+      t#table "what_links_here" table;
+
+      let table = List.map f rv in
+      t#table "recently_visited" table;
+    );
+
     (* If we are coming from a search engine then we want to highlight
      * search terms throughout the whole page ...
      *)