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.2.6.3 -r1.2.6.4
--- openacs-4/packages/dotlrn/www/spam-postgresql.xql	29 Sep 2004 09:48:23 -0000	1.2.6.3
+++ openacs-4/packages/dotlrn/www/spam-postgresql.xql	11 Nov 2004 18:42:56 -0000	1.2.6.4
@@ -51,13 +51,23 @@
             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'))
+                                     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>