Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql,v diff -u -r1.3.26.1 -r1.3.26.2 --- openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql 13 Dec 2019 14:09:23 -0000 1.3.26.1 +++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql 13 Dec 2019 14:17:42 -0000 1.3.26.2 @@ -3,7 +3,7 @@ oracle8.1.6 - + declare @@ -21,7 +21,7 @@ - + begin rel_constraint.del(:constraint_id); end; @@ -30,7 +30,7 @@ - + begin rel_segment.del(:segment_id); end; Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs-postgresql.xql,v diff -u -r1.3.26.1 -r1.3.26.2 --- openacs-4/packages/acs-subsite/tcl/rel-segments-procs-postgresql.xql 13 Dec 2019 14:09:23 -0000 1.3.26.1 +++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs-postgresql.xql 13 Dec 2019 14:17:42 -0000 1.3.26.2 @@ -3,7 +3,7 @@ postgresql7.1 - + select rel_segment__new( @@ -24,7 +24,7 @@ - + select rel_constraint__delete(:constraint_id) @@ -33,7 +33,7 @@ - + select rel_segment__delete(:segment_id) Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 16 May 2019 09:27:52 -0000 1.7.2.1 +++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl 13 Dec 2019 14:17:42 -0000 1.7.2.2 @@ -8,7 +8,25 @@ } -ad_proc -public rel_segments_new { +namespace eval rel_segment {} + +ad_proc -deprecated rel_segments_new args { + Creates a new relational segment + + @author Michael Bryzek (mbryzek@arsdigita.com) + @creation-date 12/2000 + + @return The segment_id of the new segment + + DEPRECATED: does not comply with OpenACS naming convention + + @see rel_segment::new + +} { + return [rel_segment::new {*}$args] +} + +ad_proc -public rel_segment::new { { -context_id "" } { -creation_user "" } { -creation_ip "" } @@ -36,7 +54,7 @@ } -ad_proc -public rel_segments_delete { +ad_proc -deprecated rel_segments_delete { segment_id } { Deletes the specified relational segment including all relational @@ -45,7 +63,23 @@ @author Michael Bryzek (mbryzek@arsdigita.com) @creation-date 1/12/2001 + DEPRECATED: does not comply with OpenACS naming convention + + @see rel_segment::delete } { + return [rel_segment::delete $segment_id] +} + +ad_proc -public rel_segment::delete { + segment_id +} { + Deletes the specified relational segment including all relational + constraints that depend on it. + + @author Michael Bryzek (mbryzek@arsdigita.com) + @creation-date 1/12/2001 + +} { # First delete dependent constraints. db_foreach select_dependent_constraints { select c.constraint_id Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/acs-subsite/tcl/rel-segments-procs.xql 7 Aug 2017 23:47:58 -0000 1.2 +++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs.xql 13 Dec 2019 14:17:42 -0000 1.2.2.1 @@ -1,7 +1,7 @@ - + select c.constraint_id Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.68.2.7 -r1.68.2.8 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 5 Oct 2019 13:01:38 -0000 1.68.2.7 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 13 Dec 2019 14:17:42 -0000 1.68.2.8 @@ -153,7 +153,7 @@ # Create segment of registered users set segment_name "$subsite_name_89 Members" - set segment_id [rel_segments_new $subsite_group_id membership_rel $segment_name] + set segment_id [rel_segment::new $subsite_group_id membership_rel $segment_name] # Create a constraint that says "to be a member of this subsite you must be a member # of the parent subsite. @@ -172,7 +172,7 @@ # Create segment of registered users for administrators set segment_name "$subsite_name_89 Administrators" - set admin_segment_id [rel_segments_new $subsite_group_id admin_rel $segment_name] + set admin_segment_id [rel_segment::new $subsite_group_id admin_rel $segment_name] # Grant admin privileges to the admin segment permission::grant \ Index: openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl,v diff -u -r1.12.2.9 -r1.12.2.10 --- openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl 19 Jul 2019 15:42:57 -0000 1.12.2.9 +++ openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl 13 Dec 2019 14:17:42 -0000 1.12.2.10 @@ -12,7 +12,7 @@ group::delete group::new permission::grant - rel_segments_new + rel_segment::new relation_add } \ acs_subsite_expose_bug_775 { @@ -25,7 +25,7 @@ -test_code { set group_id [group::new -group_name group_775] - set rel_id [rel_segments_new $group_id membership_rel segment_775] + set rel_id [rel_segment::new $group_id membership_rel segment_775] relation_add membership_rel $group_id 0 permission::grant -object_id $group_id -party_id 0 -privilege read Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 16 May 2019 09:54:29 -0000 1.6.2.1 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 13 Dec 2019 14:17:42 -0000 1.6.2.2 @@ -45,7 +45,7 @@ where group_id = :group_id and rel_type = :rel_type }] } { - rel_segments_delete $segment_id + rel_segment::delete $segment_id } # now remove this relationship type from the list of allowable Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 7 Jun 2018 17:41:01 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 13 Dec 2019 14:17:42 -0000 1.7.2.1 @@ -33,7 +33,7 @@ # Delete all the constraints that require this segment db_transaction { - rel_segments_delete $segment_id + rel_segment::delete $segment_id } } Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 16 May 2019 09:54:29 -0000 1.9.2.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 13 Dec 2019 14:17:42 -0000 1.9.2.2 @@ -34,7 +34,7 @@ permission::require_permission -object_id $group_id -privilege "read" db_transaction { - set segment_id [rel_segments_new -context_id $group_id $group_id $rel_type $segment_name] + set segment_id [rel_segment::new -context_id $group_id $group_id $rel_type $segment_name] } on_error { # Let's see if this segment already exists set segment_id [db_string select_segment_id { Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 16 May 2019 09:54:29 -0000 1.7.2.1 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 13 Dec 2019 14:17:42 -0000 1.7.2.2 @@ -41,7 +41,7 @@ } if { $segment_id ne "" } { - rel_segments_delete $segment_id + rel_segment::delete $segment_id } db_exec_plsql drop_relationship_type {} Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.234.2.4 -r1.234.2.5 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 24 Nov 2019 11:52:02 -0000 1.234.2.4 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 13 Dec 2019 14:17:42 -0000 1.234.2.5 @@ -682,12 +682,12 @@ set community_name [get_community_name $community_id] db_transaction { - set member_segment_id [rel_segments_new \ + set member_segment_id [rel_segment::new \ $community_id \ dotlrn_member_rel \ "[_ dotlrn.Members_of] $community_name" \ ] - set admin_segment_id [rel_segments_new \ + set admin_segment_id [rel_segment::new \ $community_id \ dotlrn_admin_rel \ "[_ dotlrn.Admins_of] $community_name" \ @@ -705,8 +705,8 @@ set admin_segment_id [get_admin_rel_id -community_id $community_id] rel_segments_revoke_permission -community_id $community_id - rel_segments_delete $admin_segment_id - rel_segments_delete $member_segment_id + rel_segment::delete $admin_segment_id + rel_segment::delete $member_segment_id } ad_proc -public list_admin_users {