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.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 28 Apr 2002 04:08:42 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 1 May 2002 01:19:47 -0000 1.12 @@ -4,71 +4,71 @@ oracle8.1.6 - - select dotlrn_users.user_id, - dotlrn_users.first_names, - dotlrn_users.last_name, - dotlrn_users.email, - dotlrn_users.access_level, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, - acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p - from dotlrn_users - where dotlrn_users.type = :type - order by dotlrn_users.last_name - + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + dotlrn_users.access_level, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + order by dotlrn_users.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'approved' - and not exists (select 1 - from acs_rels a, - dotlrn_user_types - where a.object_id_one = dotlrn_user_types.group_id - and a.object_id_two = acs_rels.object_id_two) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'approved' + and not exists (select 1 + from acs_rels a, + dotlrn_user_types + where a.object_id_one = dotlrn_user_types.group_id + and a.object_id_two = acs_rels.object_id_two) + order by persons.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' + order by persons.last_name +