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.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	6 Mar 2002 00:08:02 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	22 Mar 2002 22:23:54 -0000	1.6
@@ -14,19 +14,20 @@
     <fullquery name="select_non_dotlrn_users_count">
         <querytext>
             select count(*)
-            from cc_users
-            where not exists (select 1
-                              from dotlrn_users
-                              where dotlrn_users.user_id = cc_users.user_id)
-            and member_state = 'approved'
+            from acs_rels
+            where acs_rels.object_id_one = acs.magic_object_id('registered_users')
+            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)
         </querytext>
     </fullquery>
 
     <fullquery name="select_deactivated_users_count">
         <querytext>
             select count(*)
             from cc_users
-            where member_state = 'banned'
+            where cc_users.member_state = 'banned'
         </querytext>
     </fullquery>