Index: openacs-4/packages/dotlrn/www/spam-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/spam-oracle.xql	29 Jun 2004 10:18:03 -0000	1.3
+++ openacs-4/packages/dotlrn/www/spam-oracle.xql	24 Jul 2004 08:34:10 -0000	1.4
@@ -31,22 +31,22 @@
                       '') as last_name,
                '$safe_community_name' as community_name,
                '$community_url' as community_url
-            from party_approved_member_map,
+            from acs_rels,
                  parties,
                  acs_objects
-            where party_approved_member_map.party_id = $segment_id
-            and party_approved_member_map.member_id <> $segment_id
-            and party_approved_member_map.member_id = parties.party_id
-            and parties.party_id = acs_objects.object_id
+            where (acs_rels.object_id_one = $community_id
+            and acs_rels.object_id_two = parties.party_id
+            and (acs_rels.rel_type in ('$rel_types_str')
+	         or acs_rels.object_id_two in ($recipients_str))
+	    and parties.party_id = acs_objects.object_id
             and parties.party_id in (select acs_rels.object_id_two  
                                      from acs_rels, membership_rels
                                      where acs_rels.object_id_one = 
                                         acs.magic_object_id('registered_users')
                                      and acs_rels.rel_id = 
                                         membership_rels.rel_id
                                      and membership_rels.member_state 
-                                        = 'approved')
-            $extra_where_clause
+                                        = 'approved')) 
         </querytext>
     </fullquery>