Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 18 Feb 2002 21:02:51 -0000 1.5 @@ -28,25 +28,24 @@ - select persons.person_id as user_id, - persons.first_names, - persons.last_name, - parties.email, + select cc_users.user_id, + cc_users.first_names, + cc_users.last_name, + cc_users.email, 'limited' as access_level, 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p - from persons, - parties - where persons.person_id = parties.party_id - and not exists (select 1 - from dotlrn_users - where dotlrn_users.user_id = persons.person_id) + acs_permission.permission_p(:root_object_id, cc_users.user_id, 'admin') as site_wide_admin_p + from cc_users + where not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = cc_users.user_id) + and cc_users.member_state = 'approved' and ( - lower(dotlrn_users.last_name) like lower('%' || :search_text || '%') - or lower(dotlrn_users.first_names) like lower('%' || :search_text || '%') - or lower(dotlrn_users.email) like lower('%' || :search_text || '%') + lower(cc_users.last_name) like lower('%' || :search_text || '%') + or lower(cc_users.first_names) like lower('%' || :search_text || '%') + or lower(cc_users.email) like lower('%' || :search_text || '%') ) - order by persons.last_name + order by cc_users.last_name Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 18 Feb 2002 21:02:51 -0000 1.5 @@ -19,11 +19,12 @@ select count(*) from dual where exists (select 1 - from persons + from cc_users where not exists (select 1 from dotlrn_users - where dotlrn_users.user_id = persons.person_id) - and upper(substr(persons.last_name, 1, 1)) = upper(:dimension)) + where dotlrn_users.user_id = cc_users.user_id) + and cc_users.member_state = 'approved' + and upper(substr(cc_users.last_name, 1, 1)) = upper(:dimension)) @@ -48,21 +49,20 @@ - select persons.person_id as user_id, - persons.first_names, - persons.last_name, - parties.email, + select cc_users.user_id, + cc_users.first_names, + cc_users.last_name, + cc_users.email, 'limited' as access_level, 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p - from persons, - parties - where persons.person_id = parties.party_id - and not exists (select 1 - from dotlrn_users - where dotlrn_users.user_id = persons.person_id) - and upper(substr(persons.last_name, 1, 1)) = upper(:section) - order by persons.last_name + acs_permission.permission_p(:root_object_id, cc_users.user_id, 'admin') as site_wide_admin_p + from cc_users + where not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = cc_users.person_id) + and cc_users.member_state = 'approved' + and upper(substr(cc_users.last_name, 1, 1)) = upper(:section) + order by cc_users.last_name Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 9 Feb 2002 15:31:58 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 18 Feb 2002 21:02:51 -0000 1.5 @@ -23,20 +23,19 @@ - select persons.person_id as user_id, - persons.first_names, - persons.last_name, - parties.email, + select cc_users.user_id, + cc_users.first_names, + cc_users.last_name, + cc_users.email, 'limited' as access_level, 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, persons.person_id, 'admin') as site_wide_admin_p - from persons, - parties - where persons.person_id = parties.party_id - and not exists (select 1 - from dotlrn_users - where dotlrn_users.user_id = persons.person_id) - order by persons.last_name + acs_permission.permission_p(:root_object_id, cc_users.user_id, 'admin') as site_wide_admin_p + from cc_users + where not exists (select 1 + from dotlrn_users + where dotlrn_users.user_id = cc_users.user_id) + and cc_users.member_state = 'approved' + order by cc_users.last_name