Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/forums.info	22 Jun 2002 20:58:04 -0000	1.6
+++ openacs-4/packages/forums/forums.info	25 Jun 2002 15:38:17 -0000	1.7
@@ -87,9 +87,10 @@
             <file type="query_file" db_type="postgresql" path="www/message-view-postgresql.xql"/>
             <file type="content_page" path="www/message-view.adp"/>
             <file type="content_page" path="www/message-view.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/moderate/forum-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/moderate/forum-postgresql.xql"/>
             <file type="content_page" path="www/moderate/forum.adp"/>
             <file type="content_page" path="www/moderate/forum.tcl"/>
-            <file type="query_file" path="www/moderate/forum.xql"/>
             <file type="content_page" path="www/moderate/message-approve.tcl"/>
             <file type="content_page" path="www/moderate/message-delete.adp"/>
             <file type="content_page" path="www/moderate/message-delete.tcl"/>
Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/forum-view.adp	24 Jun 2002 21:40:16 -0000	1.7
+++ openacs-4/packages/forums/www/forum-view.adp	25 Jun 2002 15:38:17 -0000	1.8
@@ -61,8 +61,9 @@
   </else>
 
       <td>
+        <if @message_id.new_p@><b></if>
         <a href="message-view?message_id=@messages.message_id@">@messages.subject@</a> 
-        <if @messages.new_p@ eq t><b><small>(new!)</small></b></if>
+        <if @message_id.new_p@></b></if>
 <if @moderate_p@ and @messages.state@ ne approved>
         <small>(@messages.state@)</small>
 </if>
Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/index.adp	24 Jun 2002 21:40:16 -0000	1.7
+++ openacs-4/packages/forums/www/index.adp	25 Jun 2002 15:38:17 -0000	1.8
@@ -37,8 +37,9 @@
   </else>
 
       <td>
+        <if @forums.new_p@ and @forums.n_threads@ gt 0><b></if>
         <a href="forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-        <if @forums.new_p@><b><small>(new postings)</small></b></if>
+        <if @forums.new_p@ and @forums.n_threads@ gt 0></b></if>
         <if @forums.charter@ not nil><br><i>@forums.charter@</i></if>
       </td>
       <td align="center">@forums.n_threads@</td>
Index: openacs-4/packages/forums/www/moderate/forum-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/Attic/forum-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/www/moderate/forum-oracle.xql	25 Jun 2002 15:38:17 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_pending_threads">
+        <querytext>
+            select message_id,
+                   subject,
+                   user_id,
+                   posting_date,
+                   state,
+                   tree.tree_level(tree_sortkey) as tree_level
+            from forums_messages
+            where message_id in (select message_id
+                                 from forums_messages_pending
+                                 where forum_id = :forum_id)
+            or tree_sortkey in (select substr(tree_sortkey, 1, 6)
+                                from forums_messages_pending
+                                where forum_id = :forum_id)
+            order by tree_sortkey
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/forums/www/moderate/forum-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/Attic/forum-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/www/moderate/forum-postgresql.xql	25 Jun 2002 15:38:17 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_pending_threads">
+        <querytext>
+            select message_id,
+                   subject,
+                   user_id,
+                   posting_date,
+                   state,
+                   tree_level(tree_sortkey) as tree_level
+            from forums_messages
+            where message_id in (select message_id
+                                 from forums_messages_pending
+                                 where forum_id = :forum_id)
+            or tree_sortkey in (select tree_ancestor_key(tree_sortkey, 1)
+                                from forums_messages_pending
+                                where forum_id = :forum_id)
+            order by tree_sortkey
+        </querytext>
+    </fullquery>
+
+</queryset>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/moderate/forum.xql'.
Fisheye: No comparison available.  Pass `N' to diff?