Index: openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	29 May 2006 21:07:42 -0000	1.11
+++ openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	22 Aug 2006 16:27:12 -0000	1.12
@@ -3,41 +3,32 @@
 
 <fullquery name="get_relationships">
       <querytext>
-select rel_id, other_name, other_party_id, role_singular, rel_type, creation_date
-  from ( select contact__name(object_id_two,'t') as other_name,
-		object_id_two as other_party_id,
+select rel_id, other_party_id, role_singular, rel_type, creation_date
+  from ( select object_id_two as other_party_id,
                 role_two as role,
                 pretty_name as role_singular,
                 acs_rels.rel_id, acs_rels.rel_type
            from acs_rels, 
                 acs_rel_types,
-		acs_rel_roles,
-		group_distinct_member_map
+		acs_rel_roles
           where acs_rels.rel_type = acs_rel_types.rel_type
             and object_id_one = :party_id
 	    and acs_rel_types.role_two = acs_rel_roles.role
-	    and object_id_two = group_distinct_member_map.member_id
-	    and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups -package_id $package_id]])
             and acs_rels.rel_type in ( select object_type from acs_object_types where supertype = 'contact_rel')
 	 union 
-	 select contact__name(object_id_one,'t') as other_name,
-		object_id_one as other_party_id,
+	 select object_id_one as other_party_id,
                 role_one as role,
                 pretty_name as role_singular,
                 acs_rels.rel_id, acs_rels.rel_type
            from acs_rels, 
                 acs_rel_types,
-		acs_rel_roles,
-		group_distinct_member_map
+		acs_rel_roles
           where acs_rels.rel_type = acs_rel_types.rel_type
             and object_id_two = :party_id
 	    and acs_rel_types.role_one = acs_rel_roles.role
-	    and object_id_one = group_distinct_member_map.member_id
-	    and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups -package_id $package_id]])
             and acs_rels.rel_type in ( select object_type from acs_object_types where supertype = 'contact_rel')
        ) rels_temp, acs_objects
 where rels_temp.rel_id = acs_objects.object_id
- order by upper(role_singular) asc, $sort_order
       </querytext>
 </fullquery>