Index: openacs-4/packages/forums/www/message-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/forums/www/message-view-oracle.xql	3 Jun 2002 04:39:05 -0000	1.2
+++ openacs-4/packages/forums/www/message-view-oracle.xql	2 Jul 2002 19:42:19 -0000	1.3
@@ -5,69 +5,38 @@
     <fullquery name="select_message_responses">
         <querytext>
             select message_id,
+                   0 as n_attachments,
                    subject,
                    content,
                    person.name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
                    tree.tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
-            from forums_messages_approved
+            from $table_name
             where forum_id = :forum_id
             and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
-            order by tree_sortkey
+            order by $order_by
         </querytext>
     </fullquery>
 
-    <fullquery name="select_message_responses_flat">
+    <fullquery name="select_message_responses_attachments">
         <querytext>
             select message_id,
+                   (select count(*) from attachments where object_id = message_id) as n_attachments,
                    subject,
                    content,
                    person.name(user_id) as user_name,
                    to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
                    tree.tree_level(tree_sortkey) as tree_level,
                    state,
                    user_id
-            from forums_messages_approved
+            from $table_name
             where forum_id = :forum_id
             and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
-            order by posting_date, tree_sortkey
+            order by $order_by
         </querytext>
     </fullquery>
 
-    <fullquery name="select_message_responses_moderator">
-        <querytext>
-            select message_id,
-                   subject,
-                   content,
-                   person.name(user_id) as user_name,
-                   to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree.tree_level(tree_sortkey) as tree_level,
-                   state,
-                   user_id
-            from forums_messages
-            where forum_id = :forum_id
-            and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
-            order by tree_sortkey
-        </querytext>
-    </fullquery>
 
-    <fullquery name="select_message_responses_moderator_flat">
-        <querytext>
-            select message_id,
-                   subject,
-                   content,
-                   person.name(user_id) as user_name,
-                   to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
-                   tree.tree_level(tree_sortkey) as tree_level,
-                   state,
-                   user_id
-            from forums_messages
-            where forum_id = :forum_id
-            and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
-            order by posting_date, tree_sortkey
-        </querytext>
-    </fullquery>
-
 </queryset>