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.15 -r1.16
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql	16 May 2006 12:35:18 -0000	1.15
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql	18 May 2006 21:16:44 -0000	1.16
@@ -36,36 +36,34 @@
 
 <fullquery name="contact::search::results_count_not_cached.select_party_results_count">
   <querytext>
-    select count(distinct cr_items.item_id)
-      from cr_items,cr_revisions,group_approved_member_map
-     where cr_items.item_id = group_approved_member_map.member_id
-       and cr_items.latest_revision = cr_revisions.revision_id
+    select count(distinct parties.party_id)
+      from parties, $cr_from group_approved_member_map
+     where parties.party_id = group_approved_member_map.member_id
+	$cr_where
        and group_approved_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups -package_id $package_id]])
-    [contact::search_clause -and -search_id $search_id -query $query -party_id "cr_items.item_id" -revision_id "revision_id" -limit_type_p "0"]
+	$search_clause
   </querytext>
 </fullquery>
 
 <fullquery name="contact::search::results_count_not_cached.select_person_results_count">
   <querytext>
     select count(distinct person_id)
-      from persons, cr_items, cr_revisions, group_approved_member_map
+      from persons, $cr_from group_approved_member_map
      where persons.person_id = group_approved_member_map.member_id
        and group_approved_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups -package_id $package_id]])
-       and persons.person_id = cr_items.item_id
-       and cr_items.latest_revision = cr_revisions.revision_id
-    [contact::search_clause -and -search_id $search_id -query $query -party_id "persons.person_id" -revision_id "revision_id" -limit_type_p "0"]
+	$cr_where
+	$search_clause
   </querytext>
 </fullquery>
 
 <fullquery name="contact::search::results_count_not_cached.select_organization_results_count">
   <querytext>
     select count(distinct organization_id)
-      from organizations, cr_items, cr_revisions, group_approved_member_map
+      from organizations, $cr_from group_approved_member_map
      where organizations.organization_id = group_approved_member_map.member_id
        and group_approved_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups -package_id $package_id]])
-       and organizations.organization_id = cr_items.item_id
-       and cr_items.latest_revision = cr_revisions.revision_id
-    [contact::search_clause -and -search_id $search_id -query $query -party_id "organizations.organization_id" -revision_id "revision_id" -limit_type_p "0"]
+	$cr_where
+	$search_clause
   </querytext>
 </fullquery>