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 -N -r1.20 -r1.21
--- openacs-4/packages/contacts/tcl/contact-search-procs.xql	26 Jun 2006 07:02:39 -0000	1.20
+++ openacs-4/packages/contacts/tcl/contact-search-procs.xql	8 Sep 2006 12:10:19 -0000	1.21
@@ -117,6 +117,72 @@
   </querytext>
 </fullquery>
 
+<fullquery name="contact::party_id_in_sub_search_clause.get_object_type">
+  <querytext>
+    select object_type
+      from contact_searches
+     where search_id = :search_id
+  </querytext>
+</fullquery>
+
+
+<fullquery name="contact::party_id_in_sub_search_clause.get_condition_types">
+  <querytext>
+    select type 
+      from contact_search_conditions
+     where search_id = :search_id
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::party_id_in_sub_search_clause.select_party">
+    <querytext>
+    select 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]])
+	$search_clause
+    </querytext>
+</fullquery>
+
+<fullquery name="contact::party_id_in_sub_search_clause.select_person">
+    <querytext>
+        select distinct persons.person_id as party_id
+      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]])
+	$cr_where
+	$search_clause
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::party_id_in_sub_search_clause.select_organization">
+    <querytext>
+        select distinct organizations.organization_id as party_id, 
+      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::party_id_in_sub_search_clause.select_employee">
+    <querytext>
+        select distinct persons.person_id as party_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_one
+       and acs_rels.rel_type = 'contact_rels_employment'
+        $cr_where
+        $search_clause
+  </querytext>
+</fullquery>
+
 <fullquery name="contact::search::party_p_not_cached.party_in_search_p">
   <querytext>
     select 1