Index: openacs-4/packages/contacts/lib/contacts.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/lib/contacts.xql	12 Aug 2005 07:45:17 -0000	1.6
+++ openacs-4/packages/contacts/lib/contacts.xql	13 Aug 2005 14:17:34 -0000	1.7
@@ -3,15 +3,16 @@
 
 <fullquery name="contacts_pagination">
       <querytext>
-select parties.party_id, organizations.name,
-      first_names, last_name
+select parties.party_id
   from parties
       left join persons on (parties.party_id = persons.person_id)
-      left join organizations on (parties.party_id = organizations.organization_id), group_distinct_member_map, cr_items, cr_revisions
+      left join organizations on (parties.party_id =
+      organizations.organization_id)
+      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 parties.party_id = cr_items.item_id
-   and cr_items.latest_revision = cr_revisions.revision_id
-   and group_distinct_member_map.group_id $where_group_id
+   $group_where_clause
 [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
 [template::list::orderby_clause -orderby -name "contacts"]
       </querytext>
@@ -28,9 +29,10 @@
       left join persons on (parties.party_id = persons.person_id)
       left join organizations on (parties.party_id = organizations.organization_id), group_distinct_member_map
  where parties.party_id = group_distinct_member_map.member_id
-   and group_distinct_member_map.group_id $where_group_id
+$group_where_clause
 [template::list::page_where_clause -and -name "contacts" -key "party_id"]
 $group_by_group_id
+[contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"]
 [template::list::orderby_clause -orderby -name "contacts"]
       </querytext>
 </fullquery>