Index: openacs-4/packages/dotlrn/sql/oracle/admins-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/admins-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/oracle/admins-init.sql 6 May 2002 23:55:01 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/oracle/admins-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -24,6 +24,7 @@ declare foo integer; group_id integer; + segment_id integer; dotlrn_users_group_id integer; begin @@ -55,18 +56,18 @@ group_name => 'dotLRN Admins' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - ('admin', 'Staff', group_id); - - foo := rel_segment.new( + segment_id := rel_segment.new( segment_name => 'dotLRN Admins', group_id => group_id, rel_type => 'dotlrn_admin_profile_rel' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + ('admin', 'Staff', 'dotlrn_admin_profile_rel', group_id, segment_id); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/oracle/externals-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/externals-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/oracle/externals-init.sql 6 May 2002 23:55:01 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/oracle/externals-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -24,6 +24,7 @@ declare foo integer; group_id integer; + segment_id integer; dotlrn_users_group_id integer; begin @@ -55,18 +56,18 @@ group_name => 'dotLRN Externals' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - ('external', 'External', group_id); - - foo := rel_segment.new( + segment_id := rel_segment.new( segment_name => 'dotLRN Externals', group_id => group_id, rel_type => 'dotlrn_external_profile_rel' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + ('external', 'External', 'dotlrn_external_profile_rel', group_id, segment_id); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/oracle/professors-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/professors-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/oracle/professors-init.sql 6 May 2002 23:55:01 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/oracle/professors-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -24,6 +24,7 @@ declare foo integer; group_id integer; + segment_id integer; dotlrn_users_group_id integer; begin @@ -55,18 +56,18 @@ group_name => 'dotLRN Professors' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - ('professor', 'Professor', group_id); - - foo := rel_segment.new( + segment_id := rel_segment.new( segment_name => 'dotLRN Professors', group_id => group_id, rel_type => 'dotlrn_professor_profile_rel' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + ('professor', 'Professor', 'dotlrn_professor_profile_rel', group_id, segment_id); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/oracle/students-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/students-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/oracle/students-init.sql 6 May 2002 23:55:01 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/oracle/students-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -24,6 +24,7 @@ declare foo integer; group_id integer; + segment_id integer; dotlrn_users_group_id integer; begin @@ -55,18 +56,18 @@ group_name => 'dotLRN Students' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - ('student', 'Student', group_id); - - foo := rel_segment.new( + segment_id := rel_segment.new( segment_name => 'dotLRN Students', group_id => group_id, rel_type => 'dotlrn_student_profile_rel' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + ('student', 'Student', 'dotlrn_student_profile_rel', group_id, segment_id); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/oracle/users-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/users-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/sql/oracle/users-create.sql 2 Jun 2002 00:05:56 -0000 1.3 +++ openacs-4/packages/dotlrn/sql/oracle/users-create.sql 26 Jul 2002 14:53:51 -0000 1.4 @@ -40,9 +40,17 @@ constraint dotlrn_user_types_pk primary key, pretty_name varchar(200), + rel_type constraint dotlrn_user_types_rel_type_fk + references acs_rel_types (rel_type) + constraint dotlrn_user_types_rel_type_nn + not null, group_id constraint dotlrn_user_types_group_id_fk references profiled_groups (group_id) constraint dotlrn_user_types_group_id_nn + not null, + segment_id constraint dotlrn_user_types_segment_fk + references rel_segments (segment_id) + constraint dotlrn_user_types_segment_nn not null ); @@ -58,7 +66,9 @@ parties.email, dotlrn_user_types.type, dotlrn_user_types.pretty_name as pretty_type, - dotlrn_user_types.group_id + dotlrn_user_types.rel_type, + dotlrn_user_types.group_id, + dotlrn_user_types.segment_id from dotlrn_user_profile_rels, dotlrn_user_types, acs_rels, Index: openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql 8 Jul 2002 21:04:14 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/postgresql/admins-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -27,6 +27,7 @@ declare foo integer; gid integer; + sid integer; dotlrn_users_group_id integer; begin @@ -58,18 +59,18 @@ ''dotLRN Admins'' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - (''admin'', ''Staff'', gid); - - foo := rel_segment__new( + sid := rel_segment__new( ''dotLRN Admins'', gid, ''dotlrn_admin_profile_rel'' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + (''admin'', ''Staff'', ''dotlrn_admin_profile_rel'', gid, sid); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql 8 Jul 2002 21:04:16 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/postgresql/externals-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -27,6 +27,7 @@ declare foo integer; gid integer; + sid integer; dotlrn_users_group_id integer; begin @@ -58,18 +59,18 @@ ''dotLRN Externals'' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - (''external'', ''dotLRN Externals'', gid); - - foo := rel_segment__new( + sid := rel_segment__new( ''dotLRN Externals'', gid, ''dotlrn_external_profile_rel'' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + (''external'', ''Externals'', ''dotlrn_external_profile_rel'', gid, sid); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql 8 Jul 2002 21:04:16 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/postgresql/professors-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -27,6 +27,7 @@ declare foo integer; gid integer; + sid integer; dotlrn_users_group_id integer; begin @@ -58,18 +59,18 @@ ''dotLRN Professors'' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - (''professor'', ''Professor'', gid); - - foo := rel_segment__new( + sid := rel_segment__new( ''dotLRN Professors'', gid, ''dotlrn_professor_profile_rel'' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + (''professor'', ''Professor'', ''dotlrn_professor_profile_rel'', gid, sid); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/postgresql/students-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/students-init.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/postgresql/students-init.sql 8 Jul 2002 21:04:16 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/postgresql/students-init.sql 26 Jul 2002 14:53:51 -0000 1.2 @@ -27,6 +27,7 @@ declare foo integer; gid integer; + sid integer; dotlrn_users_group_id integer; begin @@ -58,18 +59,18 @@ ''dotLRN Students'' ); - insert - into dotlrn_user_types - (type, pretty_name, group_id) - values - (''student'', ''Student'', gid); - - foo := rel_segment__new( + sid := rel_segment__new( ''dotLRN Students'', gid, ''dotlrn_student_profile_rel'' ); + insert + into dotlrn_user_types + (type, pretty_name, rel_type, group_id, segment_id) + values + (''student'', ''Student'', ''dotlrn_student_profile_rel'', gid, sid); + select group_id into dotlrn_users_group_id from groups Index: openacs-4/packages/dotlrn/sql/postgresql/users-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/users-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/sql/postgresql/users-create.sql 12 Jul 2002 21:26:48 -0000 1.2 +++ openacs-4/packages/dotlrn/sql/postgresql/users-create.sql 26 Jul 2002 14:53:51 -0000 1.3 @@ -43,10 +43,20 @@ constraint dotlrn_user_types_pk primary key, pretty_name varchar(200), + rel_type varchar(100) + constraint dotlrn_user_types_rel_type_fk + references acs_rel_types (rel_type) + constraint dotlrn_user_types_rel_type_nn + not null, group_id integer constraint dotlrn_user_types_group_id_fk references profiled_groups (group_id) constraint dotlrn_user_types_group_id_nn + not null, + segment_id integer + constraint dotlrn_user_types_segment_fk + references rel_segments (segment_id) + constraint dotlrn_user_types_segment_nn not null ); @@ -62,7 +72,9 @@ parties.email, dotlrn_user_types.type, dotlrn_user_types.pretty_name as pretty_type, - dotlrn_user_types.group_id + dotlrn_user_types.rel_type, + dotlrn_user_types.group_id, + dotlrn_user_types.segment_id from dotlrn_user_profile_rels, dotlrn_user_types, acs_rels,