Index: openacs-4/packages/contacts/lib/contacts.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.xql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/contacts/lib/contacts.xql 9 Sep 2005 22:19:22 -0000 1.11 +++ openacs-4/packages/contacts/lib/contacts.xql 18 Oct 2005 23:04:21 -0000 1.12 @@ -2,19 +2,22 @@ - -select parties.party_id - from parties - left join persons on (parties.party_id = persons.person_id) - left join organizations on (parties.party_id = - organizations.organization_id) - left join cr_items on (parties.party_id = cr_items.item_id) - left join cr_revisions on (cr_items.latest_revision = - cr_revisions.revision_id ), group_distinct_member_map - where parties.party_id = group_distinct_member_map.member_id - $group_where_clause -[contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"] -[template::list::orderby_clause -orderby -name "contacts"] + + select + parties.party_id + from + parties + left join persons on (parties.party_id = persons.person_id) + left join organizations on (parties.party_id = + organizations.organization_id) + left join cr_items on (parties.party_id = cr_items.item_id) + left join cr_revisions on (cr_items.latest_revision = + cr_revisions.revision_id ), group_distinct_member_map + where + parties.party_id = group_distinct_member_map.member_id + $group_where_clause + [contact::search_clause -and -search_id $search_id -query $query -party_id "parties.party_id" -revision_id "revision_id"] + [template::list::orderby_clause -orderby -name "contacts"] @@ -47,4 +50,56 @@ + + + select + lam.attribute_id + from + ams_list_attribute_map lam, + ams_lists l + where + lam.list_id = l.list_id + and l.list_name like '%-2' + $attribute_values_query + + + + + + select + a.pretty_name + from + ams_attributes a + where + a.attribute_id = :attribute + + + + + + select + a.attribute_name as name, + a.pretty_name + from + ams_attributes a + where + a.attribute_id = :attribute + + + + + + select + av.object_id + from + ams_attribute_values av, + acs_objects o, + parties p + where + av.object_id = o.object_id + and o.context_id = p.party_id + and p.party_id = :party_id + and attribute_id = :attribute_id + +