Index: openacs-4/packages/contacts/tcl/contact-search-widget-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-widget-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/tcl/contact-search-widget-procs.xql	24 Mar 2006 13:19:15 -0000	1.1
+++ openacs-4/packages/contacts/tcl/contact-search-widget-procs.xql	27 Mar 2006 07:44:10 -0000	1.2
@@ -8,10 +8,9 @@
           from persons, parties, group_distinct_member_map
          where persons.person_id = parties.party_id
            and persons.person_id = group_distinct_member_map.member_id
-           and group_distinct_member_map.group_id  = [contacts::default_group -package_id $package_id]
-           and persons.person_id in ( select member_id from group_distinct_member_map where group_id = '11428599')
-      [contact::search::query_clause -and -query $query -party_id "persons.person_id"]
-         order by lower(contact__name(persons.person_id,'f')) asc
+           and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups]])
+        [contact::search::query_clause -and -query $query -party_id "persons.person_id"]
+         order by upper(persons.first_names) asc, upper(persons.last_name) asc
 	 limit 51
       </querytext>
 </fullquery>
@@ -22,10 +21,9 @@
           from organizations, parties, group_distinct_member_map
          where organizations.organization_id = parties.party_id
            and organizations.organization_id = group_distinct_member_map.member_id
-           and group_distinct_member_map.group_id  = [contacts::default_group -package_id $package_id]
-           and organizations.organization_id in ( select member_id from group_distinct_member_map where group_id = '11428599')
-      [contact::search::query_clause -and -query $query -party_id "organizations.organization_id"]
-         order by lower(contact__name(organizations.organization_id,'f')) asc
+           and group_distinct_member_map.group_id in ([template::util::tcl_to_sql_list [contacts::default_groups]])
+        [contact::search::query_clause -and -query $query -party_id "organizations.organization_id"]
+         order by upper(organizations.name) asc
          limit 51
       </querytext>
 </fullquery>