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.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	7 Jun 2002 04:47:38 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	9 Jul 2002 12:39:33 -0000	1.13
@@ -1,39 +1,32 @@
 <?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>
-  </fullquery>
+    <fullquery name="select_non_dotlrn_users_count">
+        <querytext>
+            select count(*)
+            from (select acs_rels.object_id_two
+                  from acs_rels
+                  where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
+                 minus
+                  select acs_rels.object_id_two
+                  from acs_rels, dotlrn_user_types
+                  where acs_rels.object_id_one = dotlrn_user_types.group_id)
+        </querytext>
+    </fullquery>
 
-  <fullquery name="select_non_dotlrn_users_count">
-    <querytext>
-      select count(*) from (
-        select acs_rels.object_id_two
-        from acs_rels
-        where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
-        MINUS
-        select acs_rels.object_id_two
-        from acs_rels, dotlrn_user_types
-        where acs_rels.object_id_one = dotlrn_user_types.group_id
-      )
-    </querytext>
-  </fullquery>
+    <fullquery name="select_deactivated_users_count">
+        <querytext>
+            select count(*)
+            from persons,
+                 acs_rels,
+                 membership_rels
+            where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
+            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>
 
-  <fullquery name="select_deactivated_users_count">
-    <querytext>
-      select count(*)
-      from persons,
-           acs_rels,
-           membership_rels
-      where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
-      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>