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.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	30 Jan 2002 23:32:41 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	6 Mar 2002 00:08:02 -0000	1.5
@@ -1,24 +1,33 @@
 <?xml version="1.0"?>
 
 <queryset>
-  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
     <fullquery name="select_dotlrn_users_count">
-      <querytext>
-        select count(*)
-        from dotlrn_users
-        where dotlrn_users.type = :type
-      </querytext>
+        <querytext>
+            select count(*)
+            from dotlrn_users
+            where dotlrn_users.type = :type
+        </querytext>
     </fullquery>
 
     <fullquery name="select_non_dotlrn_users_count">
-      <querytext>
-        select count(*)
-        from persons
-        where not exists (select 1
-                          from dotlrn_users
-                          where dotlrn_users.user_id = persons.person_id)
-      </querytext>
+        <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'
+        </querytext>
     </fullquery>
 
+    <fullquery name="select_deactivated_users_count">
+        <querytext>
+            select count(*)
+            from cc_users
+            where member_state = 'banned'
+        </querytext>
+    </fullquery>
+
 </queryset>