Index: openacs-4/packages/assessment/assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v diff -u -r1.51.2.4 -r1.51.2.5 --- openacs-4/packages/assessment/assessment.info 18 Aug 2014 21:41:19 -0000 1.51.2.4 +++ openacs-4/packages/assessment/assessment.info 26 Aug 2014 11:36:55 -0000 1.51.2.5 @@ -7,7 +7,7 @@ f f - + Eduardo Perez Ureta Assessment package that will replace the surveys quizz, complex survey, poll and other data collection packages @@ -18,7 +18,7 @@ 2 #assessment.Assessment# - + Index: openacs-4/packages/assessment/sql/oracle/assessment-actions-insert.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-actions-insert.sql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/sql/oracle/assessment-actions-insert.sql 2 Dec 2013 08:56:13 -0000 1.4 +++ openacs-4/packages/assessment/sql/oracle/assessment-actions-insert.sql 26 Aug 2014 11:36:55 -0000 1.4.2.1 @@ -19,7 +19,7 @@ set administration_name [db_string admin_name "select first_names || \' \' || last_name from persons where person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, Index: openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 2 Dec 2013 08:56:13 -0000 1.8 +++ openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 26 Aug 2014 11:36:55 -0000 1.8.2.1 @@ -133,7 +133,7 @@ person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, You have been added as a user to $system_name @@ -192,7 +192,7 @@ set subject "Your $community_name membership has been approved" set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." -set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] +set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id} Index: openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d3-0.22d4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d3-0.22d4.sql,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d3-0.22d4.sql 7 Oct 2007 22:36:53 -0000 1.3 +++ openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d3-0.22d4.sql 26 Aug 2014 11:36:55 -0000 1.3.6.1 @@ -213,7 +213,7 @@ person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, You have been added as a user to $system_name @@ -272,7 +272,7 @@ set subject "Your $community_name membership has been approved" set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." -set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] +set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id} Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql 18 Aug 2014 20:37:48 -0000 1.3.2.1 +++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql 26 Aug 2014 11:36:55 -0000 1.3.2.2 @@ -117,7 +117,7 @@ set administration_name [db_string admin_name "select first_names || \'\' \'\' || last_name from persons where person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, You have been added as a user to $system_name Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql,v diff -u -r1.13.2.3 -r1.13.2.4 --- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 19 Aug 2014 17:57:43 -0000 1.13.2.3 +++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 26 Aug 2014 11:36:55 -0000 1.13.2.4 @@ -168,18 +168,21 @@ $$ LANGUAGE plpgsql; +-- added +select define_function_args('as_action__default_actions','context_id,creation_user,package_id'); -create or replace function as_action__default_actions (integer,integer,integer) -returns integer as $$ -declare - new__context_id alias for $1; - new__creation_user alias for $2; - new__package_id alias for $3; +-- +-- procedure as_action__default_actions/2 +-- +CREATE OR REPLACE FUNCTION as_action__default_actions( + new__context_id integer, + new__creation_user integer, + new__package_id integer +) RETURNS integer AS $$ +DECLARE v_action_id integer; v_parameter_id integer; -begin - - +BEGIN v_action_id := as_action__new ( null, 'Register User', @@ -249,7 +252,7 @@ set subject "Your $community_name membership has been approved" set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." -set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] +set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id} Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-insert.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-insert.sql,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/sql/postgresql/assessment-actions-insert.sql 2 Dec 2013 08:56:13 -0000 1.5 +++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-insert.sql 26 Aug 2014 11:36:55 -0000 1.5.2.1 @@ -19,7 +19,7 @@ set administration_name [db_string admin_name "select first_names || \' \' || last_name from persons where person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d6-0.10d7.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d6-0.10d7.sql,v diff -u -r1.2.12.1 -r1.2.12.2 --- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d6-0.10d7.sql 18 Aug 2014 20:37:48 -0000 1.2.12.1 +++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d6-0.10d7.sql 26 Aug 2014 11:36:55 -0000 1.2.12.2 @@ -115,7 +115,7 @@ set administration_name [db_string admin_name "select first_names || \'\' \'\' || last_name from persons where person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, You have been added as a user to $system_name Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql 18 Aug 2014 20:37:49 -0000 1.1.2.1 +++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql 26 Aug 2014 11:36:55 -0000 1.1.2.2 @@ -23,7 +23,7 @@ set administration_name [db_string admin_name "select first_names || ' ' || last_name from persons where person_id = :admin_user_id"] set system_name [ad_system_name] -set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]. +set system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL -default ""]. set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set message "$first_names $last_name, You have been added as a user to $system_name @@ -80,7 +80,7 @@ set subject "Your $community_name membership has been approved" set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." -set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] +set email_from [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemOwner] db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id}