Index: openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/manage-memberships-oracle.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	30 May 2002 02:57:34 -0000	1.7
+++ openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	7 Jun 2002 03:24:11 -0000	1.8
@@ -18,8 +18,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
                    dotlrn_member_rels_full.rel_type,
-                   dotlrn_member_rels_full.member_state,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   dotlrn_member_rels_full.member_state
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_full
             where dotlrn_member_rels_full.user_id = :user_id
@@ -34,8 +33,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
                    dotlrn_member_rels_full.rel_type,
-                   dotlrn_member_rels_full.member_state,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   dotlrn_member_rels_full.member_state
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_full
             where dotlrn_member_rels_full.user_id = :user_id
@@ -51,8 +49,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
                    dotlrn_member_rels_full.rel_type,
-                   dotlrn_member_rels_full.member_state,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   dotlrn_member_rels_full.member_state
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_full
             where dotlrn_member_rels_full.user_id = :user_id
@@ -68,8 +65,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_full.role,
                    dotlrn_member_rels_full.rel_type,
-                   dotlrn_member_rels_full.member_state,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   dotlrn_member_rels_full.member_state
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_full
             where dotlrn_member_rels_full.user_id = :user_id
@@ -86,8 +82,7 @@
             select dotlrn_clubs_full.*,
                    dotlrn_member_rels_full.role,
                    dotlrn_member_rels_full.rel_type,
-                   dotlrn_member_rels_full.member_state,
-                   acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
+                   dotlrn_member_rels_full.member_state
             from dotlrn_clubs_full,
                  dotlrn_member_rels_full
             where dotlrn_member_rels_full.user_id = :user_id
@@ -111,8 +106,7 @@
 
     <fullquery name="select_non_member_classes">
         <querytext>
-            select dotlrn_class_instances_full.*,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+            select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.join_policy <> 'closed'
             and not exists (select 1
@@ -126,8 +120,7 @@
 
     <fullquery name="select_non_member_classes_by_department">
         <querytext>
-            select dotlrn_class_instances_full.*,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+            select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :non_member_department_key
             and dotlrn_class_instances_full.join_policy <> 'closed'
@@ -142,8 +135,7 @@
 
     <fullquery name="select_non_member_classes_by_term">
         <querytext>
-            select dotlrn_class_instances_full.*,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+            select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.term_id = :non_member_term_id
             and dotlrn_class_instances_full.join_policy <> 'closed'
@@ -158,8 +150,7 @@
 
     <fullquery name="select_non_member_classes_by_department_by_term">
         <querytext>
-            select dotlrn_class_instances_full.*,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+            select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :non_member_department_key
             and dotlrn_class_instances_full.term_id = :non_member_term_id
@@ -175,8 +166,7 @@
 
     <fullquery name="select_non_member_clubs">
         <querytext>
-            select dotlrn_clubs_full.*,
-                   acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
+            select dotlrn_clubs_full.*
             from dotlrn_clubs_full
             where dotlrn_clubs_full.join_policy <> 'closed'
             and not exists (select 1