Index: openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/threads-chunk-postgresql.xql,v
diff -u -N -r1.1 -r1.1.1.1
--- openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql	17 Dec 2003 15:45:29 -0000	1.1
+++ openacs-4/packages/forums/lib/message/threads-chunk-postgresql.xql	28 Jun 2006 20:30:28 -0000	1.1.1.1
@@ -2,56 +2,47 @@
 <queryset>
     <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-    <fullquery name="messages_select">
+    <fullquery name="messages_select_paginate">
         <querytext>
             select fm.message_id,
                    fm.subject,
-                   fm.user_id,
                    person__name(fm.user_id) as user_name,
-                   to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
-                   fm.state,
-                   (select count(*)
-                    from forums_messages_approved 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(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi,
-                   case when fm.last_child_post > (now() - interval '1 day') then 't' else 'f' end as new_p                   
+                   $replies as n_messages,
+                   to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi
             from forums_messages_approved fm
             where fm.forum_id = :forum_id
             and fm.parent_id is null
-            [template::list::orderby_clause -orderby -name "messages"]
+            [template::list::orderby_clause -orderby -name messages]
         </querytext>
     </fullquery>
 
-    <fullquery name="messages_select_moderator">
+    <fullquery name="messages_select">
         <querytext>
             select fm.message_id,
                    fm.subject,
-                   fm.user_id,
-                   person__name(fm.user_id) as user_name,
+                   fm.last_poster as user_id,
+                   person__name(fm.last_poster) as user_name,
                    to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    fm.state,
-                   (select count(*)
-                    from forums_messages 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,
+                   $replies as n_messages,
                    to_char(fm.last_child_post, 'YYYY-MM-DD HH24:MI:SS') as last_child_post_ansi,
                    case when fm.last_child_post > (now() - interval '1 day') then 't' else 'f' end as new_p                   
             from forums_messages_approved fm
             where fm.forum_id = :forum_id
             and fm.parent_id is null
-            [template::list::orderby_clause -orderby -name "messages"]
+            [template::list::page_where_clause -and -name messages -key fm.message_id]
+            [template::list::orderby_clause -orderby -name messages]
         </querytext>
     </fullquery>
 
     <partialquery name="orderby_user_name_desc">
         <querytext>
-      lower(person__name(fm.user_id)) desc
+      lower(person__name(fm.last_poster)) desc
         </querytext>
     </partialquery>
     <partialquery name="orderby_user_name_asc">
         <querytext>
-      lower(person__name(fm.user_id)) asc
+      lower(person__name(fm.last_poster)) asc
         </querytext>
     </partialquery>