Index: openacs.org-dev/packages/forums/www/forum-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/forum-view-postgresql.xql	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/forum-view-postgresql.xql	9 Aug 2002 18:11:22 -0000	1.2
@@ -11,12 +11,12 @@
                    fm.posting_date,
                    fm.state,
                    (select count(*)
-                    from forums_messages_approved fm1
+                    from $forums_table fm1
                     where fm1.forum_id = :forum_id
                     and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
                    case when acs_objects.last_modified > (now() - 1) then 't' else 'f' end as new_p                   
-            from forums_messages_approved fm,
+            from $forums_table fm,
                  acs_objects
             where fm.forum_id = :forum_id
             and fm.parent_id is null
@@ -25,7 +25,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="messages_select_moderator">
+    <partialquery name="display_data_partial">
         <querytext>
             select fm.message_id,
                    fm.subject,
@@ -34,18 +34,19 @@
                    fm.posting_date,
                    fm.state,
                    (select count(*)
-                    from forums_messages fm1
+                    from $forums_table fm1
                     where fm1.forum_id = :forum_id
                     and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
                    case when acs_objects.last_modified > (now() - 1) then 't' else 'f' end as new_p                   
-            from forums_messages fm,
+            from $forums_table fm,
                  acs_objects
             where fm.forum_id = :forum_id
             and fm.parent_id is null
             and fm.message_id = acs_objects.object_id
+            and fm.message_id IN (CURRENT_PAGE_SET)
             order by fm.posting_date desc
         </querytext>
-    </fullquery>
+    </partialquery>
 
 </queryset>