Index: openacs-4/packages/contacts/tcl/contact-search-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql 15 Jul 2005 21:01:52 -0000 1.6
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql 13 Aug 2005 14:17:35 -0000 1.7
@@ -23,16 +23,6 @@
-
-
- select parties.party_id
- from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ),
- group_distinct_member_map
- where parties.party_id = group_distinct_member_map.member_id
- and group_distinct_member_map.group_id = '[contacts::default_group]'
- [contact::search_clause -and -search_id $search_id -query "" -party_id "parties.party_id" -revision_id "revision_id"]
-
-
@@ -48,7 +38,7 @@
select count(*)
from parties left join cr_items on (parties.party_id = cr_items.item_id) left join cr_revisions on (cr_items.latest_revision = cr_revisions.revision_id ) , group_distinct_member_map
where parties.party_id = group_distinct_member_map.member_id
- and group_distinct_member_map.group_id = '[contacts::default_group]'
+ $group_where_clause
[contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]