Index: openacs-4/packages/contacts/lib/contacts.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.xql,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/contacts/lib/contacts.xql	18 May 2006 21:16:44 -0000	1.28
+++ openacs-4/packages/contacts/lib/contacts.xql	19 May 2006 09:38:46 -0000	1.29
@@ -3,68 +3,78 @@
 
 <fullquery name="contacts_pagination">
     <querytext>
-	select 
-		distinct p.party_id, $sort_item
-  	from 
-		parties p
-	$left_join, $cr_from
-        group_approved_member_map
- 	where
-	p.party_id = group_approved_member_map.member_id
-	$cr_where
-        and group_approved_member_map.group_id in ([template::util::tcl_to_sql_list $group_in_list])
-	$search_clause
-	[template::list::orderby_clause -orderby -name "contacts"]
-      </querytext>
+	select distinct parties.party_id, $sort_item
+  	  from parties $left_join, $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]])
+           $search_clause
+         [template::list::orderby_clause -orderby -name "contacts"]
+    </querytext>
 </fullquery>
 
 <fullquery name="organization_pagination">
     <querytext>
-	select 
-	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 $group_in_list])
-	$cr_where
-	$search_clause
-	[template::list::orderby_clause -orderby -name "contacts"]
-      </querytext>
+        select distinct organizations.organization_id as party_id, $sort_item
+          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]])
+           $cr_where
+           $search_clause
+         [template::list::orderby_clause -orderby -name "contacts"]
+    </querytext>
 </fullquery>
 
 <fullquery name="person_pagination">
     <querytext>
-	select 
-	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 $group_in_list])
-	$cr_where
-	$search_clause
-	[template::list::orderby_clause -orderby -name "contacts"]
-      </querytext>
+        select distinct persons.person_id as party_id, $sort_item
+          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]])
+           $cr_where
+           $search_clause
+         [template::list::orderby_clause -orderby -name "contacts"]
+    </querytext>
 </fullquery>
 
+<fullquery name="employee_pagination">
+    <querytext>
+        select distinct persons.person_id as party_id, $sort_item
+          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]])
+           and persons.person_id = acs_rels.object_id_two
+           and acs_rels.rel_type = 'contact_rels_employment'
+           $cr_where
+           $search_clause
+         [template::list::orderby_clause -orderby -name "contacts"]
+    </querytext>
+</fullquery>
+
 <fullquery name="contacts_select">      
-      <querytext>
-select  $extend_query
-	organizations.name,
-      first_names, last_name,
-       parties.party_id,
-       parties.email,
-       parties.url,
-       to_char(cr.publish_date, :date_format) as publish_date
-  from parties
-      left join persons on (parties.party_id = persons.person_id)
-      left join organizations on (parties.party_id = organizations.organization_id), cr_items ci, cr_revisions cr
- where  ci.item_id = party_id and ci.latest_revision = cr.revision_id
-[template::list::page_where_clause -and -name "contacts" -key "party_id"]
-$group_by_group_id
-[template::list::orderby_clause -orderby -name "contacts"]
-      </querytext>
+    <querytext>
+        select $extend_query
+               organizations.name,
+               persons.first_names,
+               persons.last_name,
+               parties.party_id,
+               parties.email,
+               parties.url,
+               to_char(cr_revisions.publish_date, :date_format) as publish_date
+          from parties
+               left join persons on (parties.party_id = persons.person_id)
+               left join organizations on (parties.party_id = organizations.organization_id), cr_items, cr_revisions
+         where cr_items.item_id = party_id
+           and cr_items.live_revision = cr_revisions.revision_id
+         [template::list::page_where_clause -and -name "contacts" -key "party_id"]
+         $group_by_group_id
+         [template::list::orderby_clause -orderby -name "contacts"]
+    </querytext>
 </fullquery>
 
 <fullquery name="report_contacts_select">
@@ -83,78 +93,52 @@
 
 <fullquery name="get_default_extends">
     <querytext>
-	select 
-		csem.extend_id 
-	from 
-		contact_search_extend_map csem,
-		contact_extend_options ceo
-	where 
-		ceo.extend_id = csem.extend_id
-		and ceo.aggregated_p = 'f'
-		and csem.search_id = :search_id 
+        select csem.extend_id 
+          from contact_search_extend_map csem,
+               contact_extend_options ceo
+         where ceo.extend_id = csem.extend_id
+           and ceo.aggregated_p = 'f'
+           and csem.search_id = :search_id 
     </querytext>
 </fullquery>
 
 <fullquery name="employees_select">
     <querytext>
-	select distinct
-	$extend_query
-	rel.object_id_one as party_id,
-	rel.object_id_two as employee_id
-  	from 
-	acs_rels rel,
-	parties p
- 	where 
-	rel.rel_type = 'contact_rels_employment'
-	and rel.object_id_one = p.party_id
-	[template::list::page_where_clause -and -name "contacts" -key "party_id"]
+        select distinct $extend_query
+               rel.object_id_one as party_id,
+               rel.object_id_two as employee_id
+          from acs_rels rel,
+               parties
+         where rel.rel_type = 'contact_rels_employment'
+           and rel.object_id_one = parties.party_id
+        [template::list::page_where_clause -and -name "contacts" -key "party_id"]
     </querytext>
 </fullquery>
 
 <fullquery name="employees_pagination">
     <querytext>
-	select 
-	rel.object_id_one as party_id,
-	rel.object_id_two as employee_id
-  	from 
-	acs_rels rel, persons p
- 	where 
-	rel.rel_type = 'contact_rels_employment'
-	and person_id = object_id_one
-	order by last_name
+        select rel.object_id_one as party_id,
+               rel.object_id_two as employee_id
+          from acs_rels rel, persons p
+         where rel.rel_type = 'contact_rels_employment'
+           and person_id = object_id_one
+         order by last_name
     </querytext>
 </fullquery>
 
-<fullquery name="get_search_object_type">
-    <querytext>
-	select 
-		object_type 
-	from 
-		contact_searches 
-	where 
-		search_id = :search_id
-    </querytext>
-</fullquery>
-
 <fullquery name="get_object_type">
     <querytext>
-	select 
-		object_type 
-	from 
-		contact_searches
-	where 
-		search_id = :search_id
+        select object_type 
+          from contact_searches 
+         where search_id = :search_id
     </querytext>
 </fullquery>
 
-<fullquery name="get_condition_type">
+<fullquery name="get_condition_types">
     <querytext>
-	select 
-		type 
-	from
-		contact_search_conditions
-	where 
-		search_id = :search_id
+        select type 
+          from contact_search_conditions
+         where search_id = :search_id
     </querytext>
 </fullquery>