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.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	29 Mar 2002 19:38:26 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	7 Apr 2002 01:16:52 -0000	1.9
@@ -28,47 +28,64 @@
 
     <fullquery name="select_non_dotlrn_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        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, 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'
+               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)
         and (
-            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 || '%')
+            lower(persons.last_name) like lower('%' || :search_text || '%')
+         or lower(persons.first_names) like lower('%' || :search_text || '%')
+         or lower(parties.email) like lower('%' || :search_text || '%')
         )
-        order by cc_users.last_name
+        order by persons.last_name
       </querytext>
     </fullquery>
 
     <fullquery name="select_deactivated_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        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, 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 = 'banned'
+               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'
         and (
-            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 || '%')
+            lower(persons.last_name) like lower('%' || :search_text || '%')
+         or lower(persons.first_names) like lower('%' || :search_text || '%')
+         or lower(parties.email) like lower('%' || :search_text || '%')
         )
-        order by cc_users.last_name
+        order by persons.last_name
       </querytext>
     </fullquery>
 
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.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	29 Mar 2002 19:38:26 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	7 Apr 2002 01:16:52 -0000	1.9
@@ -15,30 +15,31 @@
     </fullquery>
 
     <fullquery name="select_non_dotlrn_users_count">
-      <querytext>
-        select count(*)
-        from dual
-        where exists (select 1
-                      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 upper(substr(cc_users.last_name, 1, 1)) = upper(:dimension))
-      </querytext>
+        <querytext>
+            select count(*)
+            from acs_rels,
+                 persons
+            where acs_rels.object_id_one = acs.magic_object_id('registered_users')
+            and acs_rels.object_id_two = persons.person_id
+            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)
+            and upper(substr(persons.last_name, 1, 1)) = upper(:dimension))
+        </querytext>
     </fullquery>
 
     <fullquery name="select_deactivated_users_count">
       <querytext>
         select count(*)
-        from dual
-        where exists (select 1
-                      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 = 'banned'
-                      and upper(substr(cc_users.last_name, 1, 1)) = upper(:dimension))
+        from persons,
+             acs_rels,
+             membership_rels
+        where acs_rels.object_id_one = acs.magic_object_id('registered_users')
+        and acs_rels.object_id_two = persons.person_id
+        and acs_rels.rel_id = membership_rels.rel_id
+        and membership_rels.member_state = 'banned'
+        and upper(substr(persons.last_name, 1, 1)) = upper(:section)
       </querytext>
     </fullquery>
 
@@ -63,39 +64,55 @@
 
     <fullquery name="select_non_dotlrn_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        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, 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
+               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.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)
+        and upper(substr(persons.last_name, 1, 1)) = upper(:section)
+        order by persons.last_name
       </querytext>
     </fullquery>
 
     <fullquery name="select_deactivated_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        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, 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 = 'banned'
-        and upper(substr(cc_users.last_name, 1, 1)) = upper(:section)
-        order by cc_users.last_name
+               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'
+        and upper(substr(persons.last_name, 1, 1)) = upper(:section)
+        order by persons.last_name
       </querytext>
     </fullquery>
 
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.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	5 Apr 2002 00:16:38 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	7 Apr 2002 01:16:52 -0000	1.10
@@ -38,6 +38,7 @@
         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
@@ -51,19 +52,25 @@
 
     <fullquery name="select_deactivated_users">
       <querytext>
-        select cc_users.user_id,
-               cc_users.first_names,
-               cc_users.last_name,
-               cc_users.email,
+        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, 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 = 'banned'
-        order by cc_users.last_name
+               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
       </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/admin/users-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	29 Mar 2002 19:38:26 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	7 Apr 2002 01:16:52 -0000	1.9
@@ -24,11 +24,16 @@
     </fullquery>
 
     <fullquery name="select_deactivated_users_count">
-        <querytext>
-            select count(*)
-            from cc_users
-            where cc_users.member_state = 'banned'
-        </querytext>
+      <querytext>
+        select count(*)
+        from persons,
+             acs_rels,
+             membership_rels
+        where acs_rels.object_id_one = acs.magic_object_id('registered_users')
+        and acs_rels.object_id_two = persons.person_id
+        and acs_rels.rel_id = membership_rels.rel_id
+        and membership_rels.member_state = 'banned'
+      </querytext>
     </fullquery>
 
 </queryset>