Index: openacs-4/packages/dotlrn/tcl/privacy-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/privacy-procs-oracle.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn/tcl/privacy-procs-oracle.xql	21 Feb 2004 02:34:38 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn/tcl/privacy-procs-oracle.xql	24 Feb 2004 19:56:30 -0000	1.1.2.2
@@ -5,64 +5,24 @@
 
     <fullquery name="dotlrn_privacy::set_user_guest_p.set_user_non_guest">
         <querytext>
-            declare
-              v_rel_id integer;
             begin
-              for cur in (select r.rel_id from acs_rels r, 
-                                 membership_rels m 
-                          where m.rel_id = r.rel_id 
-                            and (r.rel_type = 'dotlrn_guest_rel' 
-                                 or r.rel_type = 'dotlrn_non_guest_rel')
-                            and r.object_id_one = acs.magic_object_id('registered_users')
-                            and r.object_id_two = :user_id)
-              loop 
-                membership_rel.del(cur.rel_id);
-              end loop;
-              v_rel_id := membership_rel.new(
-                rel_type => 'dotlrn_non_guest_rel',
-                object_id_one => acs.magic_object_id('registered_users'),
-                object_id_two => :user_id,
-                member_state => 'approved'
-              );
+              dotlrn_privacy.set_user_non_guest(:user_id);
             end;
         </querytext>
     </fullquery>
 
     <fullquery name="dotlrn_privacy::set_user_guest_p.set_user_guest">
         <querytext>
-            declare
-              v_rel_id integer;
             begin
-              for cur in (select r.rel_id from acs_rels r,
-                          membership_rels m
-                          where m.rel_id = r.rel_id
-                            and (r.rel_type = 'dotlrn_guest_rel'
-                                 or r.rel_type = 'dotlrn_non_guest_rel')
-                            and r.object_id_one = acs.magic_object_id('registered_users')
-                            and r.object_id_two = :user_id)
-              loop 
-                membership_rel.del(cur.rel_id);
-              end loop;
-              v_rel_id := membership_rel.new(
-                rel_type => 'dotlrn_guest_rel',
-                object_id_one => acs.magic_object_id('registered_users'),
-                object_id_two => :user_id,
-                member_state => 'approved'
-              );
+              dotlrn_privacy.set_user_guest(:user_id);
             end;
         </querytext>
     </fullquery>
 
     <fullquery name="dotlrn_privacy::set_read_private_data_for_rel.set_read_private_data_for_rel">
         <querytext>
-            declare
-              v_segment_id integer;
             begin
-              select segment_id into v_segment_id
-              from rel_segments
-              where group_id = acs.magic_object_id('registered_users')
-                and rel_type = :rel_type;
-              acs_permission.${action}_permission(:object_id,v_segment_id,'read_private_data');
+              dotlrn_privacy.${db_proc}(:object_id,:rel_type);
             end;
         </querytext>
     </fullquery>