Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -22,19 +22,12 @@
--
create table dotlrn_admin_profile_rels (
- rel_id constraint dotlrn_adm_prfl_rels_rel_id_fk
+ rel_id constraint dotlrn_admin_p_rels_rel_id_fk
references dotlrn_user_profile_rels (rel_id)
- constraint dotlrn_admin_prfl_rels_pk
+ constraint dotlrn_admin_profile_rels_pk
primary key
);
-create table dotlrn_full_admin_profile_rels (
- rel_id constraint dotlrn_fl_adm_prfl_rels_rel_fk
- references dotlrn_full_user_profile_rels (rel_id)
- constraint dotlrn_full_admin_prfl_rels_pk
- primary key
-);
-
@@ dotlrn-admin-profile-provider-create.sql
@@ dotlrn-admins-init.sql
@@ dotlrn-admins-package-create.sql
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,5 +25,4 @@
@@ dotlrn-admins-sanitize.sql
@@ dotlrn-admin-profile-provider-drop.sql
-drop table dotlrn_full_admin_profile_rels;
drop table dotlrn_admin_profile_rels;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-init.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-init.sql 29 Mar 2002 19:14:44 -0000 1.4
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-init.sql 28 Apr 2002 04:08:41 -0000 1.5
@@ -30,8 +30,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_admin_profile_rel',
supertype => 'dotlrn_user_profile_rel',
- pretty_name => 'dotLRN Admin Profile Membership',
- pretty_plural => 'dotLRN Admin Profile Memberships',
+ pretty_name => 'dotLRN Profile Admin',
+ pretty_plural => 'dotLRN Profile Admins',
package_name => 'dotlrn_admin_profile_rel',
table_name => 'dotlrn_admin_profile_rels',
id_column => 'rel_id',
@@ -62,7 +62,7 @@
('admin', 'Staff', group_id);
foo := rel_segment.new(
- segment_name => 'dotLRN Profiled Admins',
+ segment_name => 'dotLRN Admins',
group_id => group_id,
rel_type => 'dotlrn_admin_profile_rel'
);
@@ -80,42 +80,3 @@
end;
/
show errors
-
-declare
- foo integer;
-begin
-
- acs_rel_type.create_type(
- rel_type => 'dotlrn_full_admin_profile_rel',
- supertype => 'dotlrn_full_user_profile_rel',
- pretty_name => 'dotLRN Full Admin Profile Membership',
- pretty_plural => 'dotLRN Full Admin Profile Memberships',
- package_name => 'dotlrn_full_admin_profile_rel',
- table_name => 'dotlrn_full_admin_profile_rels',
- id_column => 'rel_id',
- object_type_one => 'profiled_group',
- role_one => null,
- min_n_rels_one => 0,
- max_n_rels_one => null,
- object_type_two => 'user',
- role_two => null,
- min_n_rels_two => 0,
- max_n_rels_two => 1
- );
-
- select min(group_id)
- into foo
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_admin_profile_provider');
-
- foo := rel_segment.new(
- segment_name => 'dotLRN Full Profiled Admins',
- group_id => foo,
- rel_type => 'dotlrn_full_admin_profile_rel'
- );
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-package-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,10 +25,13 @@
as
function new (
rel_id in dotlrn_admin_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_admin_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE;
@@ -45,10 +48,13 @@
as
function new (
rel_id in dotlrn_admin_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_admin_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE
@@ -69,10 +75,13 @@
v_rel_id := dotlrn_user_profile_rel.new(
rel_id => rel_id,
+ user_id => user_id,
+ portal_id => portal_id,
+ access_level => access_level,
+ theme_id => theme_id,
id => id,
rel_type => rel_type,
group_id => v_group_id,
- user_id => user_id,
creation_user => creation_user,
creation_ip => creation_ip
);
@@ -101,90 +110,3 @@
end;
/
show errors
-
-create or replace package dotlrn_full_admin_profile_rel
-as
- function new (
- rel_id in dotlrn_full_admin_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_admin_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE;
-
- procedure delete (
- rel_id in dotlrn_full_admin_profile_rels.rel_id%TYPE
- );
-
-end;
-/
-show errors
-
-create or replace package body dotlrn_full_admin_profile_rel
-as
- function new (
- rel_id in dotlrn_full_admin_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_admin_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE
- is
- v_rel_id dotlrn_full_user_profile_rels.rel_id%TYPE;
- v_group_id groups.group_id%TYPE;
- begin
- if group_id is null then
- select min(group_id)
- into v_group_id
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_admin_profile_provider');
- else
- v_group_id := group_id;
- end if;
-
- v_rel_id := dotlrn_full_user_profile_rel.new(
- rel_id => rel_id,
- portal_id => portal_id,
- theme_id => theme_id,
- id => id,
- rel_type => rel_type,
- group_id => v_group_id,
- user_id => user_id,
- creation_user => creation_user,
- creation_ip => creation_ip
- );
-
- insert
- into dotlrn_full_admin_profile_rels
- (rel_id)
- values
- (v_rel_id);
-
- return v_rel_id;
- end;
-
- procedure delete (
- rel_id in dotlrn_full_admin_profile_rels.rel_id%TYPE
- )
- is
- begin
- delete
- from dotlrn_full_admin_profile_rels
- where rel_id = dotlrn_full_admin_profile_rel.delete.rel_id;
-
- dotlrn_full_user_profile_rel.delete(rel_id);
- end;
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-package-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-package-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -21,5 +21,4 @@
-- @version $Id$
--
-drop package dotlrn_full_admin_profile_rel;
drop package dotlrn_admin_profile_rel;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-admins-sanitize.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-sanitize.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-admins-sanitize.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,34 +28,12 @@
select min(segment_id)
into foo
from rel_segments
- where segment_name = 'dotLRN Full Profiled Admins';
+ where segment_name = 'dotLRN Admins';
rel_segment.delete(
segment_id => foo
);
- acs_rel_type.drop_type(
- rel_type => 'dotlrn_full_admin_profile_rel',
- cascade_p => 't'
- );
-
-end;
-/
-show errors
-
-declare
- foo integer;
-begin
-
- select min(segment_id)
- into foo
- from rel_segments
- where segment_name = 'dotLRN Profiled Admins';
-
- rel_segment.delete(
- segment_id => foo
- );
-
select min(group_id)
into foo
from profiled_groups
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -22,19 +22,12 @@
--
create table dotlrn_external_profile_rels (
- rel_id constraint dotlrn_ext_rels_rel_id_fk
+ rel_id constraint dotlrn_external_p_rels_rel_fk
references dotlrn_user_profile_rels (rel_id)
- constraint dotlrn_ext_profile_rels_pk
+ constraint dotlrn_external_p_rels_pk
primary key
);
-create table dotlrn_full_ext_profile_rels (
- rel_id constraint dotlrn_fe_prfl_rels_rel_fk
- references dotlrn_full_user_profile_rels (rel_id)
- constraint dotlrn_fe_prfl_rels_pk
- primary key
-);
-
@@ dotlrn-external-profile-provider-create.sql
@@ dotlrn-externals-init.sql
@@ dotlrn-externals-package-create.sql
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,5 +25,4 @@
@@ dotlrn-externals-sanitize.sql
@@ dotlrn-external-profile-provider-drop.sql
-drop table dotlrn_full_ext_profile_rels;
drop table dotlrn_external_profile_rels;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-init.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-init.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-init.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -30,8 +30,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_external_profile_rel',
supertype => 'dotlrn_user_profile_rel',
- pretty_name => 'dotLRN External Profile Membership',
- pretty_plural => 'dotLRN External Profile Memberships',
+ pretty_name => 'dotLRN Profile External',
+ pretty_plural => 'dotLRN Profile Externals',
package_name => 'dotlrn_external_profile_rel',
table_name => 'dotlrn_external_profile_rels',
id_column => 'rel_id',
@@ -62,7 +62,7 @@
('external', 'External', group_id);
foo := rel_segment.new(
- segment_name => 'dotLRN Profiled Externals',
+ segment_name => 'dotLRN Externals',
group_id => group_id,
rel_type => 'dotlrn_external_profile_rel'
);
@@ -80,42 +80,3 @@
end;
/
show errors
-
-declare
- foo integer;
-begin
-
- acs_rel_type.create_type(
- rel_type => 'dotlrn_full_external_profile_rel',
- supertype => 'dotlrn_full_user_profile_rel',
- pretty_name => 'dotLRN Full External Profile Membership',
- pretty_plural => 'dotLRN Full External Profile Memberships',
- package_name => 'dotlrn_full_ext_profile_rel',
- table_name => 'dotlrn_full_ext_profile_rels',
- id_column => 'rel_id',
- object_type_one => 'profiled_group',
- role_one => null,
- min_n_rels_one => 0,
- max_n_rels_one => null,
- object_type_two => 'user',
- role_two => null,
- min_n_rels_two => 0,
- max_n_rels_two => 1
- );
-
- select min(group_id)
- into foo
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_external_profile_provider');
-
- foo := rel_segment.new(
- segment_name => 'dotLRN Full Profiled Externals',
- group_id => foo,
- rel_type => 'dotlrn_full_external_profile_rel'
- );
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-package-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,10 +25,13 @@
as
function new (
rel_id in dotlrn_external_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_external_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE;
@@ -45,10 +48,13 @@
as
function new (
rel_id in dotlrn_external_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_external_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE
@@ -69,10 +75,13 @@
v_rel_id := dotlrn_user_profile_rel.new(
rel_id => rel_id,
+ user_id => user_id,
+ portal_id => portal_id,
+ access_level => access_level,
+ theme_id => theme_id,
id => id,
rel_type => rel_type,
group_id => v_group_id,
- user_id => user_id,
creation_user => creation_user,
creation_ip => creation_ip
);
@@ -101,90 +110,3 @@
end;
/
show errors
-
-create or replace package dotlrn_full_ext_profile_rel
-as
- function new (
- rel_id in dotlrn_full_ext_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_external_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE;
-
- procedure delete (
- rel_id in dotlrn_full_ext_profile_rels.rel_id%TYPE
- );
-
-end;
-/
-show errors
-
-create or replace package body dotlrn_full_ext_profile_rel
-as
- function new (
- rel_id in dotlrn_full_ext_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_external_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE
- is
- v_rel_id dotlrn_full_user_profile_rels.rel_id%TYPE;
- v_group_id groups.group_id%TYPE;
- begin
- if group_id is null then
- select min(group_id)
- into v_group_id
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_external_profile_provider');
- else
- v_group_id := group_id;
- end if;
-
- v_rel_id := dotlrn_full_user_profile_rel.new(
- rel_id => rel_id,
- portal_id => portal_id,
- theme_id => theme_id,
- id => id,
- rel_type => rel_type,
- group_id => v_group_id,
- user_id => user_id,
- creation_user => creation_user,
- creation_ip => creation_ip
- );
-
- insert
- into dotlrn_full_ext_profile_rels
- (rel_id)
- values
- (v_rel_id);
-
- return v_rel_id;
- end;
-
- procedure delete (
- rel_id in dotlrn_full_ext_profile_rels.rel_id%TYPE
- )
- is
- begin
- delete
- from dotlrn_full_ext_profile_rels
- where rel_id = dotlrn_full_ext_profile_rel.delete.rel_id;
-
- dotlrn_full_user_profile_rel.delete(rel_id);
- end;
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-package-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-package-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -21,5 +21,4 @@
-- @version $Id$
--
-drop package dotlrn_full_ext_profile_rel;
drop package dotlrn_external_profile_rel;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-externals-sanitize.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-sanitize.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-externals-sanitize.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,34 +28,12 @@
select min(segment_id)
into foo
from rel_segments
- where segment_name = 'dotLRN Full Profiled Externals';
+ where segment_name = 'dotLRN Externals';
rel_segment.delete(
segment_id => foo
);
- acs_rel_type.drop_type(
- rel_type => 'dotlrn_full_external_profile_rel',
- cascade_p => 't'
- );
-
-end;
-/
-show errors
-
-declare
- foo integer;
-begin
-
- select min(segment_id)
- into foo
- from rel_segments
- where segment_name = 'dotLRN Profiled Externals';
-
- rel_segment.delete(
- segment_id => foo
- );
-
select min(group_id)
into foo
from profiled_groups
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql 16 Apr 2002 13:53:52 -0000 1.19
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql 28 Apr 2002 04:08:41 -0000 1.20
@@ -129,6 +129,7 @@
pretty_name => 'Page ID',
pretty_plural => 'Page IDs'
);
+
end;
/
show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -22,19 +22,12 @@
--
create table dotlrn_professor_profile_rels (
- rel_id constraint dotlrn_prof_rels_rel_id_fk
+ rel_id constraint dotlrn_professor_p_rels_rel_fk
references dotlrn_user_profile_rels (rel_id)
- constraint dotlrn_prof_profile_rels_pk
+ constraint dotlrn_professor_p_rels_pk
primary key
);
-create table dotlrn_full_prof_profile_rels (
- rel_id constraint dotlrn_fp_prfl_rels_rel_fk
- references dotlrn_full_user_profile_rels (rel_id)
- constraint dotlrn_full_prof_prfl_rels_pk
- primary key
-);
-
@@ dotlrn-professor-profile-provider-create.sql
@@ dotlrn-professors-init.sql
@@ dotlrn-professors-package-create.sql
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,5 +25,4 @@
@@ dotlrn-professors-sanitize.sql
@@ dotlrn-professor-profile-provider-drop.sql
-drop table dotlrn_full_prof_profile_rels;
drop table dotlrn_professor_profile_rels;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-init.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-init.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-init.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -30,8 +30,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_professor_profile_rel',
supertype => 'dotlrn_user_profile_rel',
- pretty_name => 'dotLRN Professor Profile Membership',
- pretty_plural => 'dotLRN Professor Profile Memberships',
+ pretty_name => 'dotLRN Profile Professor',
+ pretty_plural => 'dotLRN Profile Professors',
package_name => 'dotlrn_professor_profile_rel',
table_name => 'dotlrn_professor_profile_rels',
id_column => 'rel_id',
@@ -62,7 +62,7 @@
('professor', 'Professor', group_id);
foo := rel_segment.new(
- segment_name => 'dotLRN Profiled Professors',
+ segment_name => 'dotLRN Professors',
group_id => group_id,
rel_type => 'dotlrn_professor_profile_rel'
);
@@ -80,42 +80,3 @@
end;
/
show errors
-
-declare
- foo integer;
-begin
-
- acs_rel_type.create_type(
- rel_type => 'dotlrn_full_professor_profile_rel',
- supertype => 'dotlrn_full_user_profile_rel',
- pretty_name => 'dotLRN Full Professor Profile Membership',
- pretty_plural => 'dotLRN Full Professor Profile Memberships',
- package_name => 'dotlrn_full_prof_profile_rel',
- table_name => 'dotlrn_full_prof_profile_rels',
- id_column => 'rel_id',
- object_type_one => 'profiled_group',
- role_one => null,
- min_n_rels_one => 0,
- max_n_rels_one => null,
- object_type_two => 'user',
- role_two => null,
- min_n_rels_two => 0,
- max_n_rels_two => 1
- );
-
- select min(group_id)
- into foo
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_professor_profile_provider');
-
- foo := rel_segment.new(
- segment_name => 'dotLRN Full Profiled Professors',
- group_id => foo,
- rel_type => 'dotlrn_full_professor_profile_rel'
- );
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-package-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,10 +25,13 @@
as
function new (
rel_id in dotlrn_professor_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_professor_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE;
@@ -45,10 +48,13 @@
as
function new (
rel_id in dotlrn_professor_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_professor_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE
@@ -69,10 +75,13 @@
v_rel_id := dotlrn_user_profile_rel.new(
rel_id => rel_id,
+ user_id => user_id,
+ portal_id => portal_id,
+ access_level => access_level,
+ theme_id => theme_id,
id => id,
rel_type => rel_type,
group_id => v_group_id,
- user_id => user_id,
creation_user => creation_user,
creation_ip => creation_ip
);
@@ -101,90 +110,3 @@
end;
/
show errors
-
-create or replace package dotlrn_full_prof_profile_rel
-as
- function new (
- rel_id in dotlrn_full_prof_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_professor_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE;
-
- procedure delete (
- rel_id in dotlrn_full_prof_profile_rels.rel_id%TYPE
- );
-
-end;
-/
-show errors
-
-create or replace package body dotlrn_full_prof_profile_rel
-as
- function new (
- rel_id in dotlrn_full_prof_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_professor_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE
- is
- v_rel_id dotlrn_full_user_profile_rels.rel_id%TYPE;
- v_group_id groups.group_id%TYPE;
- begin
- if group_id is null then
- select min(group_id)
- into v_group_id
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_professor_profile_provider');
- else
- v_group_id := group_id;
- end if;
-
- v_rel_id := dotlrn_full_user_profile_rel.new(
- rel_id => rel_id,
- portal_id => portal_id,
- theme_id => theme_id,
- id => id,
- rel_type => rel_type,
- group_id => v_group_id,
- user_id => user_id,
- creation_user => creation_user,
- creation_ip => creation_ip
- );
-
- insert
- into dotlrn_full_prof_profile_rels
- (rel_id)
- values
- (v_rel_id);
-
- return v_rel_id;
- end;
-
- procedure delete (
- rel_id in dotlrn_full_prof_profile_rels.rel_id%TYPE
- )
- is
- begin
- delete
- from dotlrn_full_prof_profile_rels
- where rel_id = dotlrn_full_prof_profile_rel.delete.rel_id;
-
- dotlrn_full_user_profile_rel.delete(rel_id);
- end;
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-package-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-package-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -21,5 +21,4 @@
-- @version $Id$
--
-drop package dotlrn_full_prof_profile_rel;
drop package dotlrn_professor_profile_rel;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-professors-sanitize.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-sanitize.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-professors-sanitize.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,34 +28,12 @@
select min(segment_id)
into foo
from rel_segments
- where segment_name = 'dotLRN Full Profiled Professors';
+ where segment_name = 'dotLRN Professors';
rel_segment.delete(
segment_id => foo
);
- acs_rel_type.drop_type(
- rel_type => 'dotlrn_full_professor_profile_rel',
- cascade_p => 't'
- );
-
-end;
-/
-show errors
-
-declare
- foo integer;
-begin
-
- select min(segment_id)
- into foo
- from rel_segments
- where segment_name = 'dotLRN Profiled Professors';
-
- rel_segment.delete(
- segment_id => foo
- );
-
select min(group_id)
into foo
from profiled_groups
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -22,19 +22,12 @@
--
create table dotlrn_student_profile_rels (
- rel_id constraint dotlrn_std_rels_rel_id_fk
+ rel_id constraint dotlrn_student_p_rels_rel_fk
references dotlrn_user_profile_rels (rel_id)
- constraint dotlrn_student_profile_rels_pk
+ constraint dotlrn_student_p_rels_pk
primary key
);
-create table dotlrn_full_stud_profile_rels (
- rel_id constraint dotlrn_fs_prfl_rels_rel_fk
- references dotlrn_full_user_profile_rels (rel_id)
- constraint dotlrn_fs_prfl_rels_pk
- primary key
-);
-
@@ dotlrn-student-profile-provider-create.sql
@@ dotlrn-students-init.sql
@@ dotlrn-students-package-create.sql
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,5 +25,4 @@
@@ dotlrn-students-sanitize.sql
@@ dotlrn-student-profile-provider-drop.sql
-drop table dotlrn_full_stud_profile_rels;
drop table dotlrn_student_profile_rels;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-init.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-init.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-init.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -30,8 +30,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_student_profile_rel',
supertype => 'dotlrn_user_profile_rel',
- pretty_name => 'dotLRN Student Profile Membership',
- pretty_plural => 'dotLRN Student Profile Memberships',
+ pretty_name => 'dotLRN Profile Student',
+ pretty_plural => 'dotLRN Profile Students',
package_name => 'dotlrn_student_profile_rel',
table_name => 'dotlrn_student_profile_rels',
id_column => 'rel_id',
@@ -62,7 +62,7 @@
('student', 'Student', group_id);
foo := rel_segment.new(
- segment_name => 'dotLRN Profiled Students',
+ segment_name => 'dotLRN Students',
group_id => group_id,
rel_type => 'dotlrn_student_profile_rel'
);
@@ -80,42 +80,3 @@
end;
/
show errors
-
-declare
- foo integer;
-begin
-
- acs_rel_type.create_type(
- rel_type => 'dotlrn_full_student_profile_rel',
- supertype => 'dotlrn_full_user_profile_rel',
- pretty_name => 'dotLRN Full Student Profile Membership',
- pretty_plural => 'dotLRN Full Student Profile Memberships',
- package_name => 'dotlrn_full_stud_profile_rel',
- table_name => 'dotlrn_full_stud_profile_rels',
- id_column => 'rel_id',
- object_type_one => 'profiled_group',
- role_one => null,
- min_n_rels_one => 0,
- max_n_rels_one => null,
- object_type_two => 'user',
- role_two => null,
- min_n_rels_two => 0,
- max_n_rels_two => 1
- );
-
- select min(group_id)
- into foo
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_student_profile_provider');
-
- foo := rel_segment.new(
- segment_name => 'dotLRN Full Profiled Students',
- group_id => foo,
- rel_type => 'dotlrn_full_student_profile_rel'
- );
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-package-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-create.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-create.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -25,10 +25,13 @@
as
function new (
rel_id in dotlrn_student_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_student_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE;
@@ -45,10 +48,13 @@
as
function new (
rel_id in dotlrn_student_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_student_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE
@@ -69,10 +75,13 @@
v_rel_id := dotlrn_user_profile_rel.new(
rel_id => rel_id,
+ user_id => user_id,
+ portal_id => portal_id,
+ access_level => access_level,
+ theme_id => theme_id,
id => id,
rel_type => rel_type,
group_id => v_group_id,
- user_id => user_id,
creation_user => creation_user,
creation_ip => creation_ip
);
@@ -101,90 +110,3 @@
end;
/
show errors
-
-create or replace package dotlrn_full_stud_profile_rel
-as
- function new (
- rel_id in dotlrn_full_stud_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_student_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE;
-
- procedure delete (
- rel_id in dotlrn_full_stud_profile_rels.rel_id%TYPE
- );
-
-end;
-/
-show errors
-
-create or replace package body dotlrn_full_stud_profile_rel
-as
- function new (
- rel_id in dotlrn_full_stud_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_student_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_full_user_profile_rels.rel_id%TYPE
- is
- v_rel_id dotlrn_full_user_profile_rels.rel_id%TYPE;
- v_group_id groups.group_id%TYPE;
- begin
- if group_id is null then
- select min(group_id)
- into v_group_id
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_student_profile_provider');
- else
- v_group_id := group_id;
- end if;
-
- v_rel_id := dotlrn_full_user_profile_rel.new(
- rel_id => rel_id,
- portal_id => portal_id,
- theme_id => theme_id,
- id => id,
- rel_type => rel_type,
- group_id => v_group_id,
- user_id => user_id,
- creation_user => creation_user,
- creation_ip => creation_ip
- );
-
- insert
- into dotlrn_full_stud_profile_rels
- (rel_id)
- values
- (v_rel_id);
-
- return v_rel_id;
- end;
-
- procedure delete (
- rel_id in dotlrn_full_stud_profile_rels.rel_id%TYPE
- )
- is
- begin
- delete
- from dotlrn_full_stud_profile_rels
- where rel_id = dotlrn_full_stud_profile_rel.delete.rel_id;
-
- dotlrn_full_user_profile_rel.delete(rel_id);
- end;
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-package-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-package-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -21,5 +21,4 @@
-- @version $Id$
--
-drop package dotlrn_full_stud_profile_rel;
drop package dotlrn_student_profile_rel;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-students-sanitize.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-sanitize.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-students-sanitize.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,34 +28,12 @@
select min(segment_id)
into foo
from rel_segments
- where segment_name = 'dotLRN Full Profiled Students';
+ where segment_name = 'dotLRN Students';
rel_segment.delete(
segment_id => foo
);
- acs_rel_type.drop_type(
- rel_type => 'dotlrn_full_student_profile_rel',
- cascade_p => 't'
- );
-
-end;
-/
-show errors
-
-declare
- foo integer;
-begin
-
- select min(segment_id)
- into foo
- from rel_segments
- where segment_name = 'dotLRN Profiled Students';
-
- rel_segment.delete(
- segment_id => foo
- );
-
select min(group_id)
into foo
from profiled_groups
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-create.sql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql 6 Apr 2002 06:27:32 -0000 1.13
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql 28 Apr 2002 04:08:41 -0000 1.14
@@ -22,31 +22,29 @@
--
create table dotlrn_user_profile_rels (
- rel_id constraint dotlrn_usr_prfl_rels_rel_id_fk
+ rel_id constraint dotlrn_user_p_rels_rel_id_fk
references user_profile_rels (rel_id)
constraint dotlrn_user_profile_rels_pk
primary key,
- id varchar2(100)
-);
-
-create table dotlrn_full_user_profile_rels (
- rel_id constraint dotlrn_fup_rels_rel_fk
- references dotlrn_user_profile_rels (rel_id)
- constraint dotlrn_full_user_prfl_rels_pk
- primary key,
- portal_id constraint dotlrn_fup_rels_portal_fk
+ portal_id constraint dotlrn_user_p_rels_portal_fk
references portals (portal_id)
- constraint dotlrn_fup_rels_portal_nn
+ constraint dotlrn_user_p_rels_portal_nn
not null,
- theme_id constraint dotlrn_fup_rels_theme_fk
- references portal_element_themes (theme_id)
+ theme_id constraint dotlrn_user_p_rels_theme_id_fk
+ references portal_element_themes (theme_id),
+ access_level varchar(100)
+ constraint dotlrn_user_p_rels_access_ck
+ check (access_level in ('full', 'limited'))
+ constraint dotlrn_user_p_rels_access_nn
+ not null,
+ id varchar(100)
);
create table dotlrn_user_types (
- type varchar2(100)
+ type varchar(100)
constraint dotlrn_user_types_pk
primary key,
- pretty_name varchar2(200),
+ pretty_name varchar(200),
group_id constraint dotlrn_user_types_group_id_fk
references profiled_groups (group_id)
constraint dotlrn_user_types_group_id_nn
@@ -56,6 +54,9 @@
create or replace view dotlrn_users
as
select acs_rels.rel_id,
+ dotlrn_user_profile_rels.portal_id,
+ dotlrn_user_profile_rels.theme_id,
+ dotlrn_user_profile_rels.access_level,
dotlrn_user_profile_rels.id,
users.user_id,
persons.first_names,
@@ -76,15 +77,6 @@
and parties.party_id = users.user_id
and users.user_id = persons.person_id;
-create or replace view dotlrn_full_users
-as
- select dotlrn_users.*,
- dotlrn_full_user_profile_rels.portal_id,
- dotlrn_full_user_profile_rels.theme_id
- from dotlrn_users,
- dotlrn_full_user_profile_rels
- where dotlrn_users.rel_id = dotlrn_full_user_profile_rels.rel_id;
-
@@ dotlrn-user-profile-provider-create.sql
@@ dotlrn-users-init.sql
@@ dotlrn-users-package-create.sql
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-drop.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-drop.sql 29 Mar 2002 19:14:44 -0000 1.3
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-drop.sql 28 Apr 2002 04:08:41 -0000 1.4
@@ -37,9 +37,7 @@
@@ dotlrn-users-sanitize.sql
@@ dotlrn-user-profile-provider-drop.sql
-drop view dotlrn_full_users;
drop view dotlrn_users;
drop table dotlrn_user_types;
-drop table dotlrn_full_user_profile_rels;
drop table dotlrn_user_profile_rels;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-init.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-init.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-init.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,8 +28,8 @@
acs_rel_type.create_type(
rel_type => 'dotlrn_user_profile_rel',
supertype => 'user_profile_rel',
- pretty_name => 'dotLRN User Profile Membership',
- pretty_plural => 'dotLRN User Profile Memberships',
+ pretty_name => 'dotLRN Profile User',
+ pretty_plural => 'dotLRN Profile Users',
package_name => 'dotlrn_user_profile_rel',
table_name => 'dotlrn_user_profile_rels',
id_column => 'rel_id',
@@ -54,50 +54,11 @@
);
foo := rel_segment.new(
- segment_name => 'dotLRN Profiled Users',
+ segment_name => 'dotLRN Users',
group_id => foo,
rel_type => 'dotlrn_user_profile_rel'
);
end;
/
show errors
-
-declare
- foo integer;
-begin
-
- acs_rel_type.create_type(
- rel_type => 'dotlrn_full_user_profile_rel',
- supertype => 'dotlrn_user_profile_rel',
- pretty_name => 'dotLRN Full User Profile Membership',
- pretty_plural => 'dotLRN Full User Profile Memberships',
- package_name => 'dotlrn_full_user_profile_rel',
- table_name => 'dotlrn_full_user_profile_rels',
- id_column => 'rel_id',
- object_type_one => 'profiled_group',
- role_one => null,
- min_n_rels_one => 0,
- max_n_rels_one => null,
- object_type_two => 'user',
- role_two => null,
- min_n_rels_two => 0,
- max_n_rels_two => 1
- );
-
- select min(group_id)
- into foo
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_user_profile_provider');
-
- foo := rel_segment.new(
- segment_name => 'dotLRN Full Profiled Users',
- group_id => foo,
- rel_type => 'dotlrn_full_user_profile_rel'
- );
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-package-create.sql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-create.sql 29 Mar 2002 19:14:44 -0000 1.7
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-create.sql 28 Apr 2002 04:08:41 -0000 1.8
@@ -25,10 +25,13 @@
as
function new (
rel_id in dotlrn_user_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_user_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE;
@@ -45,10 +48,13 @@
as
function new (
rel_id in dotlrn_user_profile_rels.rel_id%TYPE default null,
+ user_id in users.user_id%TYPE,
+ portal_id in dotlrn_user_profile_rels.portal_id%TYPE,
+ access_level in dotlrn_user_profile_rels.access_level%TYPE,
+ theme_id in dotlrn_user_profile_rels.theme_id%TYPE default null,
id in dotlrn_user_profile_rels.id%TYPE default null,
rel_type in acs_rels.rel_type%TYPE default 'dotlrn_user_profile_rel',
group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
creation_user in acs_objects.creation_user%TYPE default null,
creation_ip in acs_objects.creation_ip%TYPE default null
) return dotlrn_user_profile_rels.rel_id%TYPE
@@ -78,9 +84,9 @@
insert
into dotlrn_user_profile_rels
- (rel_id, id)
+ (rel_id, portal_id, theme_id, access_level, id)
values
- (v_rel_id, id);
+ (v_rel_id, portal_id, theme_id, access_level, id);
return v_rel_id;
end;
@@ -100,88 +106,3 @@
end;
/
show errors
-
-create or replace package dotlrn_full_user_profile_rel
-as
- function new (
- rel_id in dotlrn_full_user_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_user_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_user_profile_rels.rel_id%TYPE;
-
- procedure delete (
- rel_id in dotlrn_full_user_profile_rels.rel_id%TYPE
- );
-
-end;
-/
-show errors
-
-create or replace package body dotlrn_full_user_profile_rel
-as
- function new (
- rel_id in dotlrn_full_user_profile_rels.rel_id%TYPE default null,
- portal_id in dotlrn_full_user_profile_rels.portal_id%TYPE,
- theme_id in dotlrn_full_user_profile_rels.theme_id%TYPE default null,
- id in dotlrn_user_profile_rels.id%TYPE default null,
- rel_type in acs_rels.rel_type%TYPE default 'dotlrn_full_user_profile_rel',
- group_id in groups.group_id%TYPE default null,
- user_id in users.user_id%TYPE,
- creation_user in acs_objects.creation_user%TYPE default null,
- creation_ip in acs_objects.creation_ip%TYPE default null
- ) return dotlrn_user_profile_rels.rel_id%TYPE
- is
- v_rel_id dotlrn_user_profile_rels.rel_id%TYPE;
- v_group_id groups.group_id%TYPE;
- begin
- if group_id is null then
- select min(group_id)
- into v_group_id
- from profiled_groups
- where profile_provider = (select min(impl_id)
- from acs_sc_impls
- where impl_name = 'dotlrn_user_profile_provider');
- else
- v_group_id := group_id;
- end if;
-
- v_rel_id := dotlrn_user_profile_rel.new(
- rel_id => rel_id,
- id => id,
- rel_type => rel_type,
- group_id => v_group_id,
- user_id => user_id,
- creation_user => creation_user,
- creation_ip => creation_ip
- );
-
- insert
- into dotlrn_full_user_profile_rels
- (rel_id, portal_id, theme_id)
- values
- (v_rel_id, portal_id, theme_id);
-
- return v_rel_id;
- end;
-
- procedure delete (
- rel_id in dotlrn_full_user_profile_rels.rel_id%TYPE
- )
- is
- begin
- delete
- from dotlrn_full_user_profile_rels
- where rel_id = dotlrn_full_user_profile_rel.delete.rel_id;
-
- dotlrn_user_profile_rel.delete(rel_id);
- end;
-
-end;
-/
-show errors
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-package-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-drop.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-package-drop.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -21,5 +21,4 @@
-- @version $Id$
--
-drop package dotlrn_full_user_profile_rel;
drop package dotlrn_user_profile_rel;
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-sanitize.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-sanitize.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-sanitize.sql 29 Mar 2002 19:14:44 -0000 1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-sanitize.sql 28 Apr 2002 04:08:41 -0000 1.3
@@ -28,34 +28,12 @@
select min(segment_id)
into foo
from rel_segments
- where segment_name = 'dotLRN Full Profiled Users';
+ where segment_name = 'dotLRN Users';
rel_segment.delete(
segment_id => foo
);
- acs_rel_type.drop_type(
- rel_type => 'dotlrn_full_user_profile_rel',
- cascade_p => 't'
- );
-
-end;
-/
-show errors
-
-declare
- foo integer;
-begin
-
- select min(segment_id)
- into foo
- from rel_segments
- where segment_name = 'dotLRN Profiled Users';
-
- rel_segment.delete(
- segment_id => foo
- );
-
select min(group_id)
into foo
from profiled_groups
Index: openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl 18 Apr 2002 19:23:36 -0000 1.21
+++ openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl 28 Apr 2002 04:08:41 -0000 1.22
@@ -90,7 +90,7 @@
ns_log notice "dotlrn-init: done with dotlrn_club::init"
# Grantee
- set grantee_id [dotlrn::get_full_users_rel_segment_id]
+ set grantee_id [dotlrn::get_users_rel_segment_id]
set package_id [dotlrn::get_package_id]
# Grant the permission
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -N -r1.45 -r1.46
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 18 Apr 2002 17:36:01 -0000 1.45
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 28 Apr 2002 04:08:41 -0000 1.46
@@ -188,12 +188,6 @@
return [db_string select_user_rel_segment {}]
}
- ad_proc -public get_full_users_rel_segment_id {} {
- returns the rel_segment_id of the dotLRN full users segment
- } {
- return [db_string select_user_rel_segment {}]
- }
-
ad_proc -public get_user_theme {
user_id
} {
@@ -310,17 +304,10 @@
ad_proc -public get_rel_type_from_user_type {
-type
- {-access_level "full"}
} {
return the appropriate rel_type base on user type and access level
} {
- if {[string equal $access_level "full"] == 1} {
- set rel_type "dotlrn_full_"
- } else {
- set rel_type "dotlrn_"
- }
-
- return "${rel_type}${type}_profile_rel"
+ return "dotlrn_${type}_profile_rel"
}
ad_proc -public parameter {
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql 18 Apr 2002 17:36:01 -0000 1.14
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql 28 Apr 2002 04:08:41 -0000 1.15
@@ -2,48 +2,54 @@