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.16 -r1.17
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql	18 May 2006 21:16:44 -0000	1.16
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql	19 May 2006 09:38:47 -0000	1.17
@@ -45,6 +45,14 @@
   </querytext>
 </fullquery>
 
+<fullquery name="contact::search::results_count_not_cached.get_condition_types">
+  <querytext>
+    select type 
+      from contact_search_conditions
+     where search_id = :search_id
+  </querytext>
+</fullquery>
+
 <fullquery name="contact::search::results_count_not_cached.select_person_results_count">
   <querytext>
     select count(distinct person_id)
@@ -59,14 +67,29 @@
 <fullquery name="contact::search::results_count_not_cached.select_organization_results_count">
   <querytext>
     select count(distinct organization_id)
-      from organizations, $cr_from 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]])
 	$cr_where
 	$search_clause
   </querytext>
 </fullquery>
 
+<fullquery name="contact::search::results_count_not_cached.select_employee_results_count">
+  <querytext>
+    select count(distinct person_id)
+      from persons, $cr_from
+           group_approved_member_map,
+           acs_rels
+     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 = acs_rels.object_id_two
+       and acs_rels.rel_type = 'contact_rels_employment'
+        $cr_where
+        $search_clause
+  </querytext>
+</fullquery>
 
 <fullquery name="contact::search::results_count_not_cached.get_object_type">
   <querytext>