Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/assessment/assessment.info	5 Jul 2018 10:42:47 -0000	1.56
+++ openacs-4/packages/assessment/assessment.info	12 Jul 2018 09:00:13 -0000	1.57
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.10.0d1" url="http://openacs.org/repository/download/apm/assessment-2.10.0d1.apm">
+    <version name="2.10.0d2" url="http://openacs.org/repository/download/apm/assessment-2.10.0d2.apm">
         <owner url="mailto:eperez@it.uc3m.es">Eduardo Perez Ureta</owner>
         <summary>Assessment package that will replace the surveys
     quizz, complex survey, poll and other data collection packages
@@ -18,7 +18,7 @@
         <maturity>2</maturity>
         <package_instance_name>#assessment.Assessment#</package_instance_name>
 
-        <provides url="assessment" version="2.10.0d1"/>
+        <provides url="assessment" version="2.10.0d2"/>
         <requires url="acs-content-repository" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
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.4 -r1.5
--- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql	3 May 2018 20:09:59 -0000	1.4
+++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql	12 Jul 2018 09:00:13 -0000	1.5
@@ -1,141 +1,144 @@
 
--- Assessment Package
--- @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
--- @creation-date 2005-01-06
+-- This file is never sourced and was therefore commented out and left
+-- just for documentation purposes
 
-select acs_object_type__create_type (
-	'as_action',
-	'as_action',
-	'as_actions',
-	'acs_object',
-	'as_actions',
-	'action_id',
-	null,
-	'f',
-	null,
-	'as_action__name'
-);
+-- -- Assessment Package
+-- -- @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
+-- -- @creation-date 2005-01-06
 
+-- select acs_object_type__create_type (
+-- 	'as_action',
+-- 	'as_action',
+-- 	'as_actions',
+-- 	'acs_object',
+-- 	'as_actions',
+-- 	'action_id',
+-- 	null,
+-- 	'f',
+-- 	null,
+-- 	'as_action__name'
+-- );
 
 
-create or replace function as_action__new (integer,varchar,varchar,text,integer,integer)
-returns integer as '
-declare 
-	new__action_id     	alias for $1;
-        new__name        	alias for $2;
-        new__description        alias for $3;
-        new__tcl_code           alias for $4;
-	new__context_id		alias for $5;
-	new__creation_user	alias for $6;
-	v_action_id	     integer;
-begin
-	v_action_id := acs_object__new (
-		new__action_id,
-		''as_action'',
-		now(),
-		new__creation_user,
-		null,
-		new__context_id
-	);
-	insert into as_actions 
-	(action_id,name,description,tcl_code)
-        values (v_action_id,new__name,new__description,new__tcl_code);
 
-        return v_action_id;
-end;' language 'plpgsql';
+-- create or replace function as_action__new (integer,varchar,varchar,text,integer,integer)
+-- returns integer as '
+-- declare 
+-- 	new__action_id     	alias for $1;
+--         new__name        	alias for $2;
+--         new__description        alias for $3;
+--         new__tcl_code           alias for $4;
+-- 	new__context_id		alias for $5;
+-- 	new__creation_user	alias for $6;
+-- 	v_action_id	     integer;
+-- begin
+-- 	v_action_id := acs_object__new (
+-- 		new__action_id,
+-- 		''as_action'',
+-- 		now(),
+-- 		new__creation_user,
+-- 		null,
+-- 		new__context_id
+-- 	);
+-- 	insert into as_actions 
+-- 	(action_id,name,description,tcl_code)
+--         values (v_action_id,new__name,new__description,new__tcl_code);
 
+--         return v_action_id;
+-- end;' language 'plpgsql';
 
 
-create or replace function as_action__delete (integer)
-returns integer as '
-declare 
-	del__action_id     alias for $1;
-begin
+
+-- create or replace function as_action__delete (integer)
+-- returns integer as '
+-- declare 
+-- 	del__action_id     alias for $1;
+-- begin
 	
-	delete from as_actions_log where 
-	action_id = del__action_id;
+-- 	delete from as_actions_log where 
+-- 	action_id = del__action_id;
 		
-	delete from as_inter_item_checks where inter_item_check_id in (select inter_item_check_id from as_action_map where action_id=del__action_id);
+-- 	delete from as_inter_item_checks where inter_item_check_id in (select inter_item_check_id from as_action_map where action_id=del__action_id);
 
-	delete from as_action_map where action_id = del__action_id;
+-- 	delete from as_action_map where action_id = del__action_id;
 	
-	delete from as_action_params where action_id=del__action_id;
+-- 	delete from as_action_params where action_id=del__action_id;
 	
-        delete from as_param_map where action_id= del__action_id;
+--         delete from as_param_map where action_id= del__action_id;
 
-	delete from as_actions where action_id = del__action_id;
-        PERFORM acs_object__delete (del__action_id);	
-	return del__action_id;	
+-- 	delete from as_actions where action_id = del__action_id;
+--         PERFORM acs_object__delete (del__action_id);	
+-- 	return del__action_id;	
 
-end;' language 'plpgsql';	
+-- end;' language 'plpgsql';	
 	
 	
 
-create or replace function as_action__default_actions (integer,integer)
-returns integer as '
-declare 
-	new__context_id		alias for $1;
-	new__creation_user	alias for $2;
-	v_action_id		integer;
-begin
+-- create or replace function as_action__default_actions (integer,integer)
+-- returns integer as '
+-- declare 
+-- 	new__context_id		alias for $1;
+-- 	new__creation_user	alias for $2;
+-- 	v_action_id		integer;
+-- begin
 
-	v_action_id := as_action__new (
-		null,
-		''Register User'',
-		''Register new users'',
-		''set password [ad_generate_random_string] 
-db_transaction {
-array set user_new_info [auth::create_user -username $user_name -email $email -first_names $first_names -last_name $last_name -password $password]
-}
-set admin_user_id [as::actions::get_admin_user_id]
-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 [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
-at $system_url
-Login information:
-Email: $email
-Password: $password
-(you may change your password after you log in)
-Thank you,
-$administration_name"
-acs_mail_lite::send -to_addr "$email" -from_addr "$admin_email" -subject "You have been added as a user to [ad_system_name] at [ad_url]" -body "$message"'',
-	new__context_id,
-	new__creation_user
-	);
+-- 	v_action_id := as_action__new (
+-- 		null,
+-- 		''Register User'',
+-- 		''Register new users'',
+-- 		''set password [ad_generate_random_string] 
+-- db_transaction {
+-- array set user_new_info [auth::create_user -username $user_name -email $email -first_names $first_names -last_name $last_name -password $password]
+-- }
+-- set admin_user_id [as::actions::get_admin_user_id]
+-- 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 [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
+-- at $system_url
+-- Login information:
+-- Email: $email
+-- Password: $password
+-- (you may change your password after you log in)
+-- Thank you,
+-- $administration_name"
+-- acs_mail_lite::send -to_addr "$email" -from_addr "$admin_email" -subject "You have been added as a user to [ad_system_name] at [ad_url]" -body "$message"'',
+-- 	new__context_id,
+-- 	new__creation_user
+-- 	);
 
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''first_names'',''First Names of the User'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''last_name'',''Last Name of the User'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''email'',''Email of the User'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''user_name'',''User name of the User'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''first_names'',''First Names of the User'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''last_name'',''Last Name of the User'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''email'',''Email of the User'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description) values (select nextval(''as_action_params_parameter_id''),v_action_id,''n'',''user_name'',''User name of the User'');
 
-v_action_id:= as_action__new (
-	null,
-	''Event Registration'',
-	''Register user to event'',
-	''set user_id [ad_conn user_id]
-events::registration::new -event_id $event_id -user_id $user_id'',
-	new__context_id,
-	new__creation_user
-	);
+-- v_action_id:= as_action__new (
+-- 	null,
+-- 	''Event Registration'',
+-- 	''Register user to event'',
+-- 	''set user_id [ad_conn user_id]
+-- events::registration::new -event_id $event_id -user_id $user_id'',
+-- 	new__context_id,
+-- 	new__creation_user
+-- 	);
 
-insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (select nextval(''as_action_params_parameter_id''),v_action_id,''q'',''event_id'',''Event to add the user'', ''select event_id,event_id from acs_events'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (select nextval(''as_action_params_parameter_id''),v_action_id,''q'',''event_id'',''Event to add the user'', ''select event_id,event_id from acs_events'');
 
-v_action_id:= as_action__new (
-	null,
-	''Add to Community'',
-	''Add user to a community'',
-	''set user_id [ad_conn user_id]
-dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t"
-dotlrn::user_add -can_browse  -user_id $user_id
-dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id'',
-	new__context_id,
-	new__creation_user
-	);
+-- v_action_id:= as_action__new (
+-- 	null,
+-- 	''Add to Community'',
+-- 	''Add user to a community'',
+-- 	''set user_id [ad_conn user_id]
+-- dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t"
+-- dotlrn::user_add -can_browse  -user_id $user_id
+-- dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id'',
+-- 	new__context_id,
+-- 	new__creation_user
+-- 	);
 
-insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (select nextval(''as_action_params_parameter_id''),v_action_id,''q'',''community_id'',''Community to add the user'', ''select pretty_name,community_id from dotlrn_communities'');
+-- insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (select nextval(''as_action_params_parameter_id''),v_action_id,''q'',''community_id'',''Community to add the user'', ''select pretty_name,community_id from dotlrn_communities'');
 
-end;' language 'plpgsql';
+-- end;' language 'plpgsql';
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.15 -r1.16
--- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql	7 Aug 2017 23:48:03 -0000	1.15
+++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql	12 Jul 2018 09:00:13 -0000	1.16
@@ -100,7 +100,7 @@
 	null,
 	'f',
 	null,
-	'as_action__name'
+	null -- name method
 );
 
 
Index: openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql	27 Oct 2014 16:40:56 -0000	1.4
+++ openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql	12 Jul 2018 09:00:13 -0000	1.5
@@ -8,7 +8,7 @@
 	'As_Inter_item_check',
 	'As_Inter_item_checks',
 	'acs_object',
-	'as_inter_items_checks',
+	'as_inter_item_checks',
 	'inter_item_check_id',
 	null,
 	'f',
@@ -112,4 +112,4 @@
 END;
 $$ LANGUAGE plpgsql;	
 	
-	
\ No newline at end of file
+	
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d1-2.10.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d1-2.10.0d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d1-2.10.0d2.sql	12 Jul 2018 09:00:13 -0000	1.1
@@ -0,0 +1,11 @@
+
+DO $$
+BEGIN
+   update acs_object_types set
+      table_name = 'as_inter_item_checks'
+    where object_type = 'as_inter_item_check';
+
+   update acs_object_types set
+      name_method = null
+    where object_type = 'as_action';
+END$$;