From: rich <rich>
Date: Tue, 28 Mar 2006 18:40:50 +0000 (+0000)
Subject: Fixed some problems found in testing.  Now appears to be working fully.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=7c289d21c7e76a0020b7b761017f2dc6cd6f8bdf;p=cocanwiki.git

Fixed some problems found in testing.  Now appears to be working fully.
---

diff --git a/scripts/lib/cocanwiki_template.ml b/scripts/lib/cocanwiki_template.ml
index 56d2d06..45f739d 100644
--- a/scripts/lib/cocanwiki_template.ml
+++ b/scripts/lib/cocanwiki_template.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: cocanwiki_template.ml,v 1.6 2006/03/27 16:43:44 rich Exp $
+ * $Id: cocanwiki_template.ml,v 1.7 2006/03/28 18:40: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
@@ -152,7 +152,7 @@ let get_template ?page dbh hostid filename =
     (* Site menu. *)
     let rows = PGSQL(dbh)
       "select url, label, ordering from sitemenu
-        where hostid = hostid order by ordering" in
+        where hostid = $hostid order by ordering" in
 
     let is_homepage =
       match page with
diff --git a/scripts/recently_visited.ml b/scripts/recently_visited.ml
index ef709c7..8522f6c 100644
--- a/scripts/recently_visited.ml
+++ b/scripts/recently_visited.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: recently_visited.ml,v 1.4 2006/03/28 16:24:08 rich Exp $
+ * $Id: recently_visited.ml,v 1.5 2006/03/28 18:40: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
@@ -27,6 +27,8 @@ open Printf
 open Cocanwiki
 open Cocanwiki_template
 
+let limit = 50_l
+
 let run r (q : cgi) dbh hostid _ user =
   let template = get_template dbh hostid "recently_visited.html" in
 
@@ -40,7 +42,8 @@ let run r (q : cgi) dbh hostid _ user =
        from recently_visited rv, pages p
       where rv.hostid = $hostid and rv.userid = $userid
         and rv.hostid = p.hostid and rv.url = p.url
-      order by 3 desc" in
+      order by 3 desc
+      limit $limit" in
 
   let table = List.map (
     fun (page, title, _) ->