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.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	1 May 2002 01:19:47 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	7 Jun 2002 03:19:55 -0000	1.11
@@ -1,39 +1,39 @@
 <?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_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 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_non_dotlrn_users_count">
+    <querytext>
+      select count(*) from (
+        select acs_rels.object_id_two
+        from acs_rels
+        where acs_rels.object_id_one = acs.magic_object_id('registered_users')
+        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 = 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>
+  <fullquery name="select_deactivated_users_count">
+    <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>