Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 28 Nov 2001 04:59:51 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 7 May 2002 22:06:09 -0000 1.4 @@ -157,6 +157,16 @@ + + + begin + apm_package.delete( + package_id => :package_id + ); + end; + + + Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 28 Nov 2001 21:32:52 -0000 1.16 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 7 May 2002 22:06:09 -0000 1.17 @@ -845,14 +845,12 @@ ad_proc -public apm_package_instance_new { - { - -package_id 0 - } - instance_name context_id package_key + {-package_id 0} + instance_name + context_id + package_key } { - Creates a new instance of a package. - } { if {$package_id == 0} { set package_id [db_null] @@ -884,7 +882,15 @@ return $package_id } +ad_proc -public apm_package_instance_delete { + package_id +} { + Deletes an instance of a package +} { + db_exec_plsql apm_package_instance_delete {} +} + ad_proc apm_parameter_sync {package_key package_id} { Syncs the parameters in the database with the memory cache. This must be called Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 10 Sep 2001 20:38:46 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 7 May 2002 22:06:09 -0000 1.5 @@ -254,6 +254,32 @@ } +ad_proc -public site_node_delete_package_instance { + {-node_id:required} +} { + Wrapper for apm_package_instance_delete + + @author Arjun Sanyal (arjun@openforc.net) + @creation-date 2002-05-02 +} { + db_transaction { + + set package_id \ + [site_nodes::get_package_id_from_node_id -node_id $node_id] + + # Update the site map + db_dml unmount { + update site_nodes + set object_id = null + where node_id = :node_id + } + + apm_package_instance_delete $package_id + + + } +} + ad_proc -public site_node_mount_application { { -sync_p "t" } { -return "package_id" } Index: openacs-4/packages/dotlrn/sql/oracle/applet-sc-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/applet-sc-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn/sql/oracle/applet-sc-create.sql 6 May 2002 23:55:01 -0000 1.1 +++ openacs-4/packages/dotlrn/sql/oracle/applet-sc-create.sql 7 May 2002 22:06:11 -0000 1.2 @@ -20,219 +20,228 @@ -- copyright 2001, OpenForce, Inc. -- distributed under the GNU GPL v2 -- --- for Oracle 8/8i. (We're guessing 9i works, too). --- --- ben@openforce.net, arjun@openforce.net --- -- started October 1st, 2001 -- we remember September 11th -- -- This is the service contract for dotLRN applets. A dotlrn applet MUST -- have AT LEAST the procs (with the proper arguments) defined below to work --- as a dotlrn applet. +-- as a dotlrn applet. See the short explanation of what the proc is about below declare - sc_dotlrn_contract integer; - foo integer; + sc_dotlrn_contract integer; + foo integer; begin - sc_dotlrn_contract := acs_sc_contract.new ( - contract_name => 'dotlrn_applet', - contract_desc => 'dotLRN Applet contract' - ); + sc_dotlrn_contract := acs_sc_contract.new ( + contract_name => 'dotlrn_applet', + contract_desc => 'dotLRN Applet contract' + ); + + -- A simple proc to return the pretty name of the applet + foo := acs_sc_msg_type.new ( + msg_type_name => 'dotlrn_applet.GetPrettyName.InputType', + msg_type_spec => '' + ); + + foo := acs_sc_msg_type.new ( + msg_type_name => 'dotlrn_applet.GetPrettyName.OutputType', + msg_type_spec => 'pretty_name:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'GetPrettyName', + 'Get the pretty name of the applet', + 't', -- not cacheable + 0, -- n_args + 'dotlrn_applet.GetPrettyName.InputType', + 'dotlrn_applet.GetPrettyName.OutputType' + ); + + -- Adds the applet to dotlrn (used for one-time initialization) + -- Call in the the dotlrn-init sequence + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddApplet.InputType', + msg_type_spec => '' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddApplet.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'AddApplet', + 'Add the Applet to dotlrn - used for one-time initialization', + 'f', -- not cacheable + 0, -- n_args + 'dotlrn_applet.AddApplet.InputType', + 'dotlrn_applet.AddApplet.OutputType' + ); + + -- Removes the applet from dotlrn (used for one-time destroy) + -- ** Not yet implimented ** + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveApplet.InputType', + msg_type_spec => '' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveApplet.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'RemoveApplet', + 'Remove the applet', + 'f', -- not cacheable + 0, -- n_args + 'dotlrn_applet.RemoveApplet.InputType', + 'dotlrn_applet.RemoveApplet.OutputType' + ); - -- Get a pretty name - foo := acs_sc_msg_type.new ( - msg_type_name => 'dotlrn_applet.GetPrettyName.InputType', - msg_type_spec => '' - ); + -- Adds the applet to a community + -- Called at community creation time. Adding applets after creation time + -- is ** not implimented yet ** + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddAppletToCommunity.InputType', + msg_type_spec => 'community_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddAppletToCommunity.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'AddAppletToCommunity', + 'Add the Applet to a specific dotlrn community', + 'f', -- not cacheable + 1, -- n_args + 'dotlrn_applet.AddAppletToCommunity.InputType', + 'dotlrn_applet.AddAppletToCommunity.OutputType' + ); + + -- Removes the applet from a community + -- Called at community delete time. Deleting applets before that time + -- ** not implimented yet ** + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveAppletFromCommunity.InputType', + msg_type_spec => 'community_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveAppletFromCommunity.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'RemoveAppletFromCommunity', + 'Remove the applet from a given community', + 'f', -- not cacheable + 1, -- n_args + 'dotlrn_applet.RemoveAppletFromCommunity.InputType', + 'dotlrn_applet.RemoveAppletFromCommunity.OutputType' + ); + + -- AddUser: used for user-specific one time stuff + -- Called when a user is added as a dotlrn user. An example: + -- dotlrn-calendar will create a personal calendar for the new user. + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddUser.InputType', + msg_type_spec => 'user_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddUser.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'AddUser', + 'Add a user to dotlrn, used for user-specific one-time init', + 'f', -- not cacheable + 1, -- n_args + 'dotlrn_applet.AddUser.InputType', + 'dotlrn_applet.AddUser.OutputType' + ); + + -- RemoveUser: used for user-specific one time stuff + -- Just like AddUser above, but when we delete a dotlrn user + -- Example: dotlrn-calendar would delete the user's personal calendar + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveUser.InputType', + msg_type_spec => 'user_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveUser.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'RemoveUser', + 'Remove a user from dotlrn', + 'f', -- not cacheable + 1, -- n_args + 'dotlrn_applet.RemoveUser.InputType', + 'dotlrn_applet.RemoveUser.OutputType' + ); + + -- Adds a user to the a specfic dotlrn community. An example of this + -- is to make the community's calendar items visable on user's personal + -- calendar + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddUserToCommunity.InputType', + msg_type_spec => 'community_id:integer,user_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.AddUserToCommunity.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'AddUserToCommunity', + 'Add a user to a community', + 'f', -- not cacheable + 2, -- n_args + 'dotlrn_applet.AddUserToCommunity.InputType', + 'dotlrn_applet.AddUserToCommunity.OutputType' + ); - foo := acs_sc_msg_type.new ( - msg_type_name => 'dotlrn_applet.GetPrettyName.OutputType', - msg_type_spec => 'pretty_name:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'GetPrettyName', - 'Get the pretty name of the applet', - 't', -- not cacheable - 0, -- n_args - 'dotlrn_applet.GetPrettyName.InputType', - 'dotlrn_applet.GetPrettyName.OutputType' - ); - - -- Add the applet to dotlrn (used for one-time initialization) - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddApplet.InputType', - msg_type_spec => '' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddApplet.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'AddApplet', - 'Add the Applet to dotlrn - used for one-time initialization', - 'f', -- not cacheable - 0, -- n_args - 'dotlrn_applet.AddApplet.InputType', - 'dotlrn_applet.AddApplet.OutputType' - ); - - -- Add the applet to a community - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddAppletToCommunity.InputType', - msg_type_spec => 'community_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddAppletToCommunity.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'AddAppletToCommunity', - 'Add the Applet to a specific dotlrn community', - 'f', -- not cacheable - 1, -- n_args - 'dotlrn_applet.AddAppletToCommunity.InputType', - 'dotlrn_applet.AddAppletToCommunity.OutputType' - ); - - -- add a user to dotlrn (used for user-specific one time stuff) - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddUser.InputType', - msg_type_spec => 'user_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddUser.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'AddUser', - 'Add a user to dotlrn, used for user-specific one-time init', - 'f', -- not cacheable - 1, -- n_args - 'dotlrn_applet.AddUser.InputType', - 'dotlrn_applet.AddUser.OutputType' - ); - - - -- add a user to the a specfic dotlrn community - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddUserToCommunity.InputType', - msg_type_spec => 'community_id:integer,user_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.AddUserToCommunity.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'AddUserToCommunity', - 'Add a user to a community', - 'f', -- not cacheable - 2, -- n_args - 'dotlrn_applet.AddUserToCommunity.InputType', - 'dotlrn_applet.AddUserToCommunity.OutputType' - ); - - -- remove a user from dotlrn - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveUser.InputType', - msg_type_spec => 'user_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveUser.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'RemoveUser', - 'Remove a user from dotlrn', - 'f', -- not cacheable - 1, -- n_args - 'dotlrn_applet.RemoveUser.InputType', - 'dotlrn_applet.RemoveUser.OutputType' - ); - - -- remove a user from the community - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveUserFromCommunity.InputType', - msg_type_spec => 'community_id:integer,user_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveUserFromCommunity.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'RemoveUserFromCommunity', - 'Remove a user from a community, applet does appropriate cleanup', - 'f', -- not cacheable - 2, -- n_args - 'dotlrn_applet.RemoveUserFromCommunity.InputType', - 'dotlrn_applet.RemoveUserFromCommunity.OutputType' - ); - - -- remove the applet from dotlrn - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveApplet.InputType', - msg_type_spec => '' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveApplet.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'RemoveApplet', - 'Remove the applet', - 'f', -- not cacheable - 0, -- n_args - 'dotlrn_applet.RemoveApplet.InputType', - 'dotlrn_applet.RemoveApplet.OutputType' - ); - - -- remove the applet from a community - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveAppletFromCommunity.InputType', - msg_type_spec => 'community_id:integer,package_id:integer' - ); - - foo := acs_sc_msg_type.new( - msg_type_name => 'dotlrn_applet.RemoveAppletFromCommunity.OutputType', - msg_type_spec => 'success_p:boolean,error_message:string' - ); - - foo := acs_sc_operation.new ( - 'dotlrn_applet', - 'RemoveAppletFromCommunity', - 'Remove the applet from a given community', - 'f', -- not cacheable - 2, -- n_args - 'dotlrn_applet.RemoveAppletFromCommunity.InputType', - 'dotlrn_applet.RemoveAppletFromCommunity.OutputType' - ); - - - + -- Removes a user from a specfic dotlrn community. Just like above, + -- but removal. + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveUserFromCommunity.InputType', + msg_type_spec => 'community_id:integer,user_id:integer' + ); + + foo := acs_sc_msg_type.new( + msg_type_name => 'dotlrn_applet.RemoveUserFromCommunity.OutputType', + msg_type_spec => 'success_p:boolean,error_message:string' + ); + + foo := acs_sc_operation.new ( + 'dotlrn_applet', + 'RemoveUserFromCommunity', + 'Remove a user from a community, applet does appropriate cleanup', + 'f', -- not cacheable + 2, -- n_args + 'dotlrn_applet.RemoveUserFromCommunity.InputType', + 'dotlrn_applet.RemoveUserFromCommunity.OutputType' + ); + + + + end; / show errors Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/dotlrn/tcl/class-procs.tcl 6 May 2002 15:56:22 -0000 1.32 +++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 7 May 2002 22:06:11 -0000 1.33 @@ -158,7 +158,7 @@ ns_set put $extra_vars join_policy $join_policy if {[empty_string_p $pretty_name]} { - set pretty_name "[dotlrn_community::get_community_type_name $class_key]; $term $year" + set pretty_name "[dotlrn_community::get_community_type_name $class_key]; $term $year" } db_transaction { @@ -194,13 +194,18 @@ } ad_proc -public add_user { - {-rel_type "dotlrn_student_rel"} + {-rel_type ""} {-community_id:required} {-user_id:required} {-member_state "approved"} } { - Assigns a user to a particular role for that class. Roles in DOTLRN can be student, prof, ta, admin + Assigns a user to a particular role for that class. + Roles in DOTLRN can be student, prof, ta, admin } { + if {[empty_string_p $rel_type]} { + set rel_type "dotlrn_student_rel" + } + set extra_vars [ns_set create] ns_set put $extra_vars class_instance_id $community_id @@ -233,15 +238,19 @@ } { get the term for this class instance } { - return [dotlrn_term::get_term_name -term_id [get_term_id -class_instance_id $class_instance_id]] + return [dotlrn_term::get_term_name \ + -term_id [get_term_id -class_instance_id $class_instance_id] + ] } ad_proc -public get_term_year { {-class_instance_id:required} } { get the term year for this class instance } { - return [dotlrn_term::get_term_year -term_id [get_term_id -class_instance_id $class_instance_id]] + return [dotlrn_term::get_term_year \ + -term_id [get_term_id -class_instance_id $class_instance_id] + ] } ad_proc -public can_create { Index: openacs-4/packages/dotlrn/tcl/club-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/club-procs.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/dotlrn/tcl/club-procs.tcl 16 Apr 2002 13:53:52 -0000 1.12 +++ openacs-4/packages/dotlrn/tcl/club-procs.tcl 7 May 2002 22:06:11 -0000 1.13 @@ -94,13 +94,16 @@ } ad_proc -public add_user { - {-rel_type "dotlrn_member_rel"} + {-rel_type "" } {-community_id:required} {-user_id:required} {-member_state "approved"} } { Assigns a user to a particular role for that club. } { + if [empty_string_p $rel_type] { + set rel_type "dotlrn_member_rel" + } dotlrn_community::add_user_to_community \ -rel_type $rel_type \ -community_id $community_id \ 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 -N -r1.111 -r1.112 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 6 May 2002 23:55:02 -0000 1.111 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 7 May 2002 22:06:11 -0000 1.112 @@ -90,17 +90,28 @@ } { # Figure out parent_node_id set parent_node_id [get_type_node_id $parent_type] - array set parent_node [site_node [site_nodes::get_url_from_node_id -node_id $parent_node_id]] + array set parent_node [site_node \ + [site_nodes::get_url_from_node_id \ + -node_id $parent_node_id] + ] db_transaction { # Create the class directly using PL/SQL API set community_type_key [db_exec_plsql create_community_type {}] # Create the node - set new_node_id [site_node_create $parent_node_id [ad_decode $url_part "" $community_type_key $url_part]] + set new_node_id [site_node_create \ + $parent_node_id \ + [ad_decode $url_part "" $community_type_key $url_part] + ] # Instantiate the package - set package_id [site_node_create_package_instance $new_node_id $pretty_name $parent_node(object_id) [one_community_type_package_key]] + set package_id [site_node_create_package_instance \ + $new_node_id \ + $pretty_name \ + $parent_node(object_id) \ + [one_community_type_package_key] + ] # Set some parameters ad_parameter -package_id $package_id -set 0 dotlrn_level_p @@ -112,11 +123,13 @@ # since new_type is only called when creating a dept or a class, # not a class instance, club, or subcomm, we just do this - dotlrn_community::set_type_portal_id \ - -community_type $community_type_key \ - -portal_id [get_type_portal_id -community_type [dotlrn_class::community_type] \ + set type_portal_id [get_type_portal_id \ + -community_type [dotlrn_class::community_type] ] + dotlrn_community::set_type_portal_id \ + -community_type $community_type_key \ + -portal_id $type_portal_id } return $community_type_key @@ -602,47 +615,29 @@ community_id user_id } { - add a user to a particular community + add a user to a particular community based on the community type } { - if {[string equal [get_toplevel_community_type_from_community_id $community_id] "dotlrn_class_instance"]} { - if {![empty_string_p $rel_type]} { - dotlrn_class::add_user \ - -rel_type $rel_type \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } else { - dotlrn_class::add_user \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } - } elseif {[string equal [get_toplevel_community_type_from_community_id $community_id] "dotlrn_club"]} { - if {![empty_string_p $rel_type]} { - dotlrn_club::add_user \ - -rel_type $rel_type \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } else { - dotlrn_club::add_user \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } + set toplevel_community_type \ + [get_toplevel_community_type_from_community_id $community_id] + + if {[string equal $toplevel_community_type "dotlrn_class_instance"]} { + dotlrn_class::add_user \ + -rel_type $rel_type \ + -community_id $community_id \ + -user_id $user_id \ + -member_state $member_state + } elseif {[string equal $toplevel_community_type "dotlrn_club"]} { + dotlrn_club::add_user \ + -rel_type $rel_type \ + -community_id $community_id \ + -user_id $user_id \ + -member_state $member_state } else { - if {![empty_string_p $rel_type]} { - add_user_to_community \ - -rel_type $rel_type \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } else { - add_user_to_community \ - -community_id $community_id \ - -user_id $user_id \ - -member_state $member_state - } + add_user_to_community \ + -rel_type $rel_type \ + -community_id $community_id \ + -user_id $user_id \ + -member_state $member_state } } @@ -653,7 +648,8 @@ {-member_state "approved"} {-extra_vars ""} } { - Assigns a user to a particular role for that class. Roles in DOTLRN can be student, prof, ta, admin + Assigns a user to a particular role for that class. + Roles in DOTLRN can be student, prof, ta, admin } { if {[member_p $community_id $user_id]} { return @@ -1328,7 +1324,7 @@ # Callback ns_log notice "aks3 $applet_key" - applet_call $applet_key RemoveAppletFromCommunity [list $community_id $package_id] + applet_call $applet_key RemoveAppletFromCommunity [list $community_id] ns_log notice "aks4 $applet_key" # Delete from the DB @@ -1363,12 +1359,20 @@ where community_id = :community_id } + # call the communitie's delete pl/sql, which removes + # the group + + ad_return_complaint 1 "aks4" + + db_exec_plsql \ + remove_community \ + "begin dotlrn_community.delete(:community_id); end;" + + ad_return_complaint 1 "aks3" + # delete the rel segments delete_rel_segments -community_id $community_id - # Remove the row - db_exec_plsql remove_community "begin dotlrn_community.delete(:community_id); end;" - if {![empty_string_p $admin_portal_id]} { portal::delete $admin_portal_id } 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.47 -r1.48 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 6 May 2002 23:55:02 -0000 1.47 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 7 May 2002 22:06:11 -0000 1.48 @@ -161,6 +161,44 @@ return $package_id } + ad_proc -public unmount_package { + {-package_id:required} + } { + unmount a package previously mounted with dotlrn::mount_package. + just a nice wrapper for the dotrn-*-procs so they don't have to + deal with site_nodes and apm directly. + } { + db_transaction { + # site node del package instance + site_node_delete_package_instance \ + -package_id $package_id \ + -node_id [site_nodes::get_node_id_from_package_id \ + -package_id $package_id + ] + } + } + + ad_proc -public unmount_community_applet_package { + {-community_id:required} + {-package_key:required} + } { + unmount a package from under a community. + should be in dotlrn_community:: + } { + db_transaction { + set parent_node_id [site_nodes::get_node_id_from_package_id \ + -package_id [dotlrn_community::get_package_id $community_id] + ] + + set child_node_id [site_nodes::get_node_id_from_child_name \ + -parent_node_id $parent_node_id \ + -name $package_key] + + # site node del package instance + site_node_delete_package_instance -node_id $child_node_id + } + } + ad_proc -public get_node_id {} { return the root node id for dotLRN } { Index: openacs-4/packages/dotlrn-bboard/sql/oracle/dotlrn-bboard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/sql/oracle/dotlrn-bboard-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/dotlrn-bboard/sql/oracle/dotlrn-bboard-create.sql 29 Mar 2002 19:16:08 -0000 1.6 +++ openacs-4/packages/dotlrn-bboard/sql/oracle/dotlrn-bboard-create.sql 7 May 2002 22:06:11 -0000 1.7 @@ -57,6 +57,14 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_bboard', + 'RemoveApplet', + 'dotlrn_bboard::remove_applet', + 'TCL' + ); -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( @@ -67,17 +75,14 @@ 'TCL' ); - - - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_bboard', - 'RemoveApplet', - 'dotlrn_bboard::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_bboard::remove_applet_from_community', 'TCL' ); - -- AddUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', @@ -87,21 +92,21 @@ 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_bboard', - 'AddUserToCommunity', - 'dotlrn_bboard::add_user_to_community', + 'RemoveUser', + 'dotlrn_bboard::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_bboard', - 'RemoveUser', - 'dotlrn_bboard::remove_user', + 'AddUserToCommunity', + 'dotlrn_bboard::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl 6 May 2002 23:56:23 -0000 1.32 +++ openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl 7 May 2002 22:06:11 -0000 1.33 @@ -72,10 +72,8 @@ } ad_proc -public remove_applet { - community_id - package_id } { - remove the applet from the community + remove the applet from dotlrn } { } @@ -84,7 +82,9 @@ } { Add the bboard applet to a dotlrn community } { - set portal_id [dotlrn_community::get_portal_id -community_id $community_id] + set portal_id [dotlrn_community::get_portal_id \ + -community_id $community_id + ] bboard_portlet::make_self_available $portal_id @@ -94,7 +94,11 @@ } # Create and Mount - set package_id [dotlrn::instantiate_and_mount -mount_point "forums" $community_id [package_key]] + set package_id [dotlrn::instantiate_and_mount \ + -mount_point "forums" \ + $community_id\ + [package_key] + ] set auto_create_forum_p [ad_parameter \ -package_id [apm_package_id_from_key "dotlrn-bboard"] \ @@ -109,18 +113,26 @@ if {$auto_create_forum_p == "t"} { # set up a forum inside that instance, with context set to the # package ID of the bboard package - bboard_forum_new -bboard_id $package_id -short_name $auto_create_forum_name -context_id $package_id + bboard_forum_new \ + -bboard_id $package_id \ + -short_name $auto_create_forum_name \ + -context_id $package_id } bboard_portlet::add_self_to_page $portal_id $package_id # set up the DS for the admin page - set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id] + set admin_portal_id [dotlrn_community::get_admin_portal_id \ + -community_id $community_id + ] bboard_admin_portlet::make_self_available $admin_portal_id bboard_admin_portlet::add_self_to_page $admin_portal_id $package_id # Set up permissions for basic members (Admins inherit no problem) - set members [dotlrn_community::get_rel_segment_id -community_id $community_id -rel_type dotlrn_member_rel] + set members [dotlrn_community::get_rel_segment_id \ + -community_id $community_id \ + -rel_type dotlrn_member_rel + ] ad_permission_grant $members $package_id bboard_read_forum ad_permission_grant $members $package_id bboard_read_category ad_permission_grant $members $package_id bboard_read_message @@ -130,6 +142,14 @@ return $package_id } + ad_proc -public remove_applet_from_community { + community_id + } { + remove the applet from the given community + } { + ad_return_complaint 1 "aks1" + } + ad_proc -public add_user { community_id } { @@ -150,7 +170,10 @@ } { Add a user to a specific dotlrn community } { - set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]] + set package_id [dotlrn_community::get_applet_package_id \ + $community_id \ + [applet_key] + ] set portal_id [dotlrn::get_workspace_portal_id $user_id] set element_id [bboard_portlet::add_self_to_page $portal_id $package_id] @@ -163,7 +186,10 @@ } { Remove a user from a community } { - set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]] + set package_id [dotlrn_community::get_applet_package_id \ + $community_id \ + [applet_key] + ] set portal_id [dotlrn::get_workspace_portal_id $user_id] bboard_portlet::remove_self_from_page $portal_id $package_id Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v diff -u -N -r1.45 -r1.46 --- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 6 May 2002 23:56:24 -0000 1.45 +++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 7 May 2002 22:06:11 -0000 1.46 @@ -207,16 +207,11 @@ ad_proc -public remove_applet_from_community { community_id - comm_package_id } { remove the applet from the community } { set group_calendar_id [get_group_calendar_id -community_id $community_id] - - # aks debug - ad_return_complaint 1 "aks2: [site_nodes::get_node_id_from_child_name -parent_node_id [site_nodes::get_node_id_from_package_id -package_id $comm_package_id] -name [package_key] ]" - # first, revoke the permissions set members_segment_id [dotlrn_community::get_rel_segment_id \ -community_id $community_id \ @@ -262,29 +257,26 @@ calendar_portlet::make_self_unavailable $portal_id - portal::remove_element [portal::get_element_id_by_ds \ + portal::remove_element [portal::get_element_ids_by_ds \ $portal_id \ [calendar_portlet::my_name] ] # now for the "full calendar" portlet from the comm's portal calendar_full_portlet::make_self_unavailable $portal_id - portal::remove_element [portal::get_element_id_by_ds \ + portal::remove_element [portal::get_element_ids_by_ds \ $portal_id \ [calendar_full_portlet::my_name] ] # and finally kill the group calendar - calendar_delete $group_calendar_id + calendar_delete -calendar_id $group_calendar_id # delete the package instance and the site node where it's mounted - - # XXX it appears that the only way to get the package id - # of the calendar package mounted at this point, is through - # the comm_id/comm_package_id and the url, this should be better! - dotlrn::unmount_package -package_id $package_id - + dotlrn::unmount_community_applet_package \ + -community_id $community_id \ + -package_key [package_key] } ad_proc -public add_user { Index: openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-dotlrn-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-dotlrn-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-dotlrn-create.sql 29 Mar 2002 19:17:09 -0000 1.6 +++ openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-dotlrn-create.sql 7 May 2002 22:06:11 -0000 1.7 @@ -57,6 +57,14 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_dotlrn', + 'RemoveApplet', + 'dotlrn_dotlrn::remove_applet', + 'TCL' + ); -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( @@ -67,16 +75,16 @@ 'TCL' ); - - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_dotlrn', - 'RemoveApplet', - 'dotlrn_dotlrn::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_dotlrn::remove_applet_from_community', 'TCL' ); + -- AddUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', @@ -86,22 +94,21 @@ 'TCL' ); - - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_dotlrn', - 'AddUserToCommunity', - 'dotlrn_dotlrn::add_user_to_community', + 'RemoveUser', + 'dotlrn_dotlrn::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_dotlrn', - 'RemoveUser', - 'dotlrn_dotlrn::remove_user', + 'AddUserToCommunity', + 'dotlrn_dotlrn::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-create.sql 29 Mar 2002 19:17:09 -0000 1.2 +++ openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-create.sql 7 May 2002 22:06:11 -0000 1.3 @@ -57,6 +57,14 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_members', + 'RemoveApplet', + 'dotlrn_members::remove_applet', + 'TCL' + ); -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( @@ -67,13 +75,12 @@ 'TCL' ); - - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members', - 'RemoveApplet', - 'dotlrn_members::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_members::remove_applet_from_community', 'TCL' ); @@ -86,22 +93,21 @@ 'TCL' ); - - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members', - 'AddUserToCommunity', - 'dotlrn_members::add_user_to_community', + 'RemoveUser', + 'dotlrn_members::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members', - 'RemoveUser', - 'dotlrn_members::remove_user', + 'AddUserToCommunity', + 'dotlrn_members::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-staff-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-staff-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-staff-create.sql 29 Mar 2002 19:17:09 -0000 1.2 +++ openacs-4/packages/dotlrn-dotlrn/sql/oracle/dotlrn-members-staff-create.sql 7 May 2002 22:06:11 -0000 1.3 @@ -57,6 +57,14 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_members_staff', + 'RemoveApplet', + 'dotlrn_members_staff::remove_applet', + 'TCL' + ); -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( @@ -67,13 +75,12 @@ 'TCL' ); - - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members_staff', - 'RemoveApplet', - 'dotlrn_members_staff::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_members_staff::remove_applet_from_community', 'TCL' ); @@ -86,22 +93,21 @@ 'TCL' ); - - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members_staff', - 'AddUserToCommunity', - 'dotlrn_members_staff::add_user_to_community', + 'RemoveUser', + 'dotlrn_members_staff::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_members_staff', - 'RemoveUser', - 'dotlrn_members_staff::remove_user', + 'AddUserToCommunity', + 'dotlrn_members_staff::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-faq/sql/oracle/dotlrn-faq-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/sql/oracle/dotlrn-faq-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn-faq/sql/oracle/dotlrn-faq-create.sql 29 Mar 2002 19:17:45 -0000 1.5 +++ openacs-4/packages/dotlrn-faq/sql/oracle/dotlrn-faq-create.sql 7 May 2002 22:06:11 -0000 1.6 @@ -57,6 +57,15 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_faq', + 'RemoveApplet', + 'dotlrn_faq::remove_applet', + 'TCL' + ); + -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', @@ -66,12 +75,12 @@ 'TCL' ); - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_faq', - 'RemoveApplet', - 'dotlrn_faq::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_faq::remove_applet_from_community', 'TCL' ); @@ -84,21 +93,21 @@ 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_faq', - 'AddUserToCommunity', - 'dotlrn_faq::add_user_to_community', + 'RemoveUser', + 'dotlrn_faq::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_faq', - 'RemoveUser', - 'dotlrn_faq::remove_user', + 'AddUserToCommunity', + 'dotlrn_faq::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-fs/sql/oracle/dotlrn-fs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/sql/oracle/dotlrn-fs-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/dotlrn-fs/sql/oracle/dotlrn-fs-create.sql 29 Mar 2002 19:18:25 -0000 1.6 +++ openacs-4/packages/dotlrn-fs/sql/oracle/dotlrn-fs-create.sql 7 May 2002 22:06:11 -0000 1.7 @@ -57,6 +57,15 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_fs', + 'RemoveApplet', + 'dotlrn_fs::remove_applet', + 'TCL' + ); + -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', @@ -66,12 +75,12 @@ 'TCL' ); - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_fs', - 'RemoveApplet', - 'dotlrn_fs::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_fs::remove_applet_from_community', 'TCL' ); @@ -84,21 +93,21 @@ 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_fs', - 'AddUserToCommunity', - 'dotlrn_fs::add_user_to_community', + 'RemoveUser', + 'dotlrn_fs::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_fs', - 'RemoveUser', - 'dotlrn_fs::remove_user', + 'AddUserToCommunity', + 'dotlrn_fs::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-news/sql/oracle/dotlrn-news-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/sql/oracle/dotlrn-news-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/dotlrn-news/sql/oracle/dotlrn-news-create.sql 29 Mar 2002 19:19:43 -0000 1.4 +++ openacs-4/packages/dotlrn-news/sql/oracle/dotlrn-news-create.sql 7 May 2002 22:06:11 -0000 1.5 @@ -57,6 +57,15 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_news', + 'RemoveApplet', + 'dotlrn_news::remove_applet', + 'TCL' + ); + -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', @@ -66,12 +75,12 @@ 'TCL' ); - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_news', - 'RemoveApplet', - 'dotlrn_news::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_news::remove_applet_from_community', 'TCL' ); @@ -84,21 +93,21 @@ 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_news', - 'AddUserToCommunity', - 'dotlrn_news::add_user_to_community', + 'RemoveUser', + 'dotlrn_news::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_news', - 'RemoveUser', - 'dotlrn_news::remove_user', + 'AddUserToCommunity', + 'dotlrn_news::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 30 Apr 2002 21:23:59 -0000 1.9 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 7 May 2002 22:06:12 -0000 1.10 @@ -57,7 +57,8 @@
  • @subgroups.pretty_name@
    [Admin - | Rename] + | Rename + | Delete]
  • New @sub_pretty_name@ Index: openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql 29 Mar 2002 19:22:48 -0000 1.2 +++ openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql 7 May 2002 22:06:12 -0000 1.3 @@ -51,6 +51,15 @@ impl_pl => 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + impl_contract_name => 'dotlrn_applet', + impl_name => 'dotlrn_research', + impl_operation_name => 'RemoveApplet', + impl_alias => 'dotlrn_research::remove_applet', + impl_pl => 'TCL' + ); + -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', @@ -60,12 +69,12 @@ impl_pl => 'TCL' ); - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_research', - impl_operation_name => 'RemoveApplet', - impl_alias => 'dotlrn_research::remove_applet', + impl_operation_name => 'RemoveAppletFromCommunity', + impl_alias => 'dotlrn_research::remove_applet_from_community', impl_pl => 'TCL' ); @@ -78,21 +87,21 @@ impl_pl => 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_research', - impl_operation_name => 'AddUserToCommunity', - impl_alias => 'dotlrn_research::add_user_to_community', + impl_operation_name => 'RemoveUser', + impl_alias => 'dotlrn_research::remove_user', impl_pl => 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_research', - impl_operation_name => 'RemoveUser', - impl_alias => 'dotlrn_research::remove_user', + impl_operation_name => 'AddUserToCommunity', + impl_alias => 'dotlrn_research::add_user_to_community', impl_pl => 'TCL' ); Index: openacs-4/packages/dotlrn-static/sql/oracle/dotlrn-static-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/sql/oracle/dotlrn-static-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn-static/sql/oracle/dotlrn-static-create.sql 29 Mar 2002 19:24:12 -0000 1.3 +++ openacs-4/packages/dotlrn-static/sql/oracle/dotlrn-static-create.sql 7 May 2002 22:06:12 -0000 1.4 @@ -55,6 +55,14 @@ 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + 'dotlrn_applet', + 'dotlrn_static', + 'RemoveApplet', + 'dotlrn_static::remove_applet', + 'TCL' + ); -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( @@ -65,14 +73,12 @@ 'TCL' ); - - - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_static', - 'RemoveApplet', - 'dotlrn_static::remove_applet', + 'RemoveAppletFromCommunity', + 'dotlrn_static::remove_applet_from_community', 'TCL' ); @@ -85,21 +91,21 @@ 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_static', - 'AddUserToCommunity', - 'dotlrn_static::add_user_to_community', + 'RemoveUser', + 'dotlrn_static::remove_user', 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( 'dotlrn_applet', 'dotlrn_static', - 'RemoveUser', - 'dotlrn_static::remove_user', + 'AddUserToCommunity', + 'dotlrn_static::add_user_to_community', 'TCL' ); Index: openacs-4/packages/dotlrn-syllabus/sql/oracle/dotlrn-syllabus-applet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/sql/oracle/dotlrn-syllabus-applet-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-syllabus/sql/oracle/dotlrn-syllabus-applet-create.sql 27 Apr 2002 17:20:15 -0000 1.1 +++ openacs-4/packages/dotlrn-syllabus/sql/oracle/dotlrn-syllabus-applet-create.sql 7 May 2002 22:06:12 -0000 1.2 @@ -51,6 +51,15 @@ impl_pl => 'TCL' ); + -- RemoveApplet + foo := acs_sc_impl.new_alias ( + impl_contract_name => 'dotlrn_applet', + impl_name => 'dotlrn_syllabus', + impl_operation_name => 'RemoveApplet', + impl_alias => 'dotlrn_syllabus::remove_applet', + impl_pl => 'TCL' + ); + -- AddAppletToCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', @@ -60,12 +69,12 @@ impl_pl => 'TCL' ); - -- RemoveApplet + -- RemoveAppletFromCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_syllabus', - impl_operation_name => 'RemoveApplet', - impl_alias => 'dotlrn_syllabus::remove_applet', + impl_operation_name => 'RemoveAppletFromCommunity', + impl_alias => 'dotlrn_syllabus::remove_applet_from_community', impl_pl => 'TCL' ); @@ -78,21 +87,21 @@ impl_pl => 'TCL' ); - -- AddUserToCommunity + -- RemoveUser foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_syllabus', - impl_operation_name => 'AddUserToCommunity', - impl_alias => 'dotlrn_syllabus::add_user_to_community', + impl_operation_name => 'RemoveUser', + impl_alias => 'dotlrn_syllabus::remove_user', impl_pl => 'TCL' ); - -- RemoveUser + -- AddUserToCommunity foo := acs_sc_impl.new_alias ( impl_contract_name => 'dotlrn_applet', impl_name => 'dotlrn_syllabus', - impl_operation_name => 'RemoveUser', - impl_alias => 'dotlrn_syllabus::remove_user', + impl_operation_name => 'AddUserToCommunity', + impl_alias => 'dotlrn_syllabus::add_user_to_community', impl_pl => 'TCL' );