Index: openacs-4/packages/contacts/tcl/contact-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/contacts/tcl/contact-search-procs.tcl	15 Aug 2005 08:19:22 -0000	1.18
+++ openacs-4/packages/contacts/tcl/contact-search-procs.tcl	23 Nov 2005 17:31:47 -0000	1.19
@@ -160,13 +160,19 @@
 } {
     
     # If we do not have a search_id, limit the list to only users in the default group.
-    
+    set type_list [list]
     if {[exists_and_not_null search_id]} {
         set group_where_clause ""
+	set type_list [db_list get_condition_type {}]
     } else {
         set group_where_clause "and group_distinct_member_map.group_id = [contacts::default_group]"
     }
-    return [db_string select_results_count {}]
+
+    if { [string equal [lsearch -exact $type_list "employees"] "-1"] } {
+        return [db_string select_results_count {}]
+    } else {
+        return [db_string select_employees_results_count {}]
+    }
 }
 
 ad_proc -private contact::party_id_in_sub_search_clause {
@@ -264,13 +270,18 @@
     set db_conditions [db_list_of_lists select_conditions {}]
     set conditions [list]
     foreach condition $db_conditions {
-        lappend conditions [contacts::search::condition_type \
-				-type [lindex $condition 0] \
-				-request pretty \
-				-var_list [lindex $condition 1] \
-			       ]
+	if { ![string equal [lindex $condition 0] "employees"] } {
+	    lappend conditions [contacts::search::condition_type \
+				    -type [lindex $condition 0] \
+				    -request pretty \
+				    -var_list [lindex $condition 1] \
+				   ]
+	} else {
+	    lappend conditions employees
+	}
     }
 
+    
     if { [llength $conditions] > 0 } {
 
 	contact::search::get -search_id $search_id -array "search_info"
@@ -282,15 +293,20 @@
 	} else {
 	    set object_type [_ contacts.people_or_organizations]
 	}
-
-        set results "[_ contacts.Search_for_all_object_type_where]\n"
-
+	
+	if { [llength conditions] == 1 && [string equal $conditions "employees"] } {
+	    set results "[_ contacts.search_for_employee]"
+	} else {
+	    set results "[_ contacts.Search_for_all_object_type_where]\n"
+	}
+	
 	if { $search_info(all_or_any) == "all" } {
 	    append results [join $conditions "\n[_ contacts.and] "]
 	} else {
 	    append results [join $conditions "\n[_ contacts.or] "]
 	}
 
+
 	if { $format == "text/html" } { 
 	    set results [ad_enhanced_text_to_html $results]
 	} else {
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.8 -r1.9
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql	15 Aug 2005 09:09:20 -0000	1.8
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql	23 Nov 2005 17:31:47 -0000	1.9
@@ -43,6 +43,28 @@
   </querytext>
 </fullquery>
 
+<fullquery name="contact::search::results_count_not_cached.get_condition_type">
+  <querytext>
+	select
+                distinct type
+        from
+                contact_search_conditions
+        where
+                search_id = :search_id
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::search::results_count_not_cached.select_employees_results_count">
+  <querytext>
+        select
+                count(object_id_one)
+        from
+                acs_rels
+        where
+                rel_type = 'contact_rels_employment'
+  </querytext>
+</fullquery>
+
 <fullquery name="contact::search::where_clause_not_cached.get_search_info">
   <querytext>
     select title,