Index: openacs-4/packages/dotlrn/www/spam-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/spam-postgresql.xql	29 Jun 2004 10:18:03 -0000	1.3
+++ openacs-4/packages/dotlrn/www/spam-postgresql.xql	13 Jan 2005 13:57:21 -0000	1.4
@@ -43,23 +43,31 @@
                END 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
+            where (acs_rels.object_id_one = $community_id
+            and acs_rels.object_id_two = parties.party_id
             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
+                                     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' ))
+	    $who_will_receive_this_clause
         </querytext>
     </fullquery>
 
+    <partialquery name="recipients_clause">
+      <querytext>
+          and parties.party_id in ($recipients_str)
+      </querytext>
+    </partialquery>
+
+    <partialquery name="rel_types_clause">
+      <querytext>
+          and acs_rels.rel_type in ($rel_types_str)
+      </querytext>
+    </partialquery>
+
 </queryset>