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 -N -r1.3 -r1.3.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql	2 Dec 2013 08:56:13 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create-p.sql	18 Aug 2014 20:37:48 -0000	1.3.2.1
@@ -18,20 +18,28 @@
 
 
 
-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;
+
+
+-- added
+select define_function_args('as_action__new','action_id,name,description,tcl_code,context_id,creation_user');
+
+--
+-- procedure as_action__new/6
+--
+CREATE OR REPLACE FUNCTION as_action__new(
+   new__action_id integer,
+   new__name varchar,
+   new__description varchar,
+   new__tcl_code text,
+   new__context_id integer,
+   new__creation_user integer
+) RETURNS integer AS $$
+DECLARE 
 	v_action_id	     integer;
-begin
+BEGIN
 	v_action_id := acs_object__new (
 		new__action_id,
-		''as_action'',
+		'as_action',
 		now(),
 		new__creation_user,
 		null,
@@ -42,15 +50,24 @@
         values (v_action_id,new__name,new__description,new__tcl_code);
 
         return v_action_id;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 
 
-create or replace function as_action__delete (integer)
-returns integer as '
-declare 
-	del__action_id     alias for $1;
-begin
+
+
+-- added
+select define_function_args('as_action__delete','action_id');
+
+--
+-- procedure as_action__delete/1
+--
+CREATE OR REPLACE FUNCTION as_action__delete(
+   del__action_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
 	
 	delete from as_actions_log where 
 	action_id = del__action_id;
@@ -67,23 +84,32 @@
         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;
+
+
+-- added
+select define_function_args('as_action__default_actions','context_id,creation_user');
+
+--
+-- procedure as_action__default_actions/2
+--
+CREATE OR REPLACE FUNCTION as_action__default_actions(
+   new__context_id integer,
+   new__creation_user integer
+) RETURNS integer AS $$
+DECLARE 
 	v_action_id		integer;
-begin
+BEGIN
 
 	v_action_id := as_action__new (
 		null,
-		''Register User'',
-		''Register new users'',
-		''set password [ad_generate_random_string] 
+		'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]
 }
@@ -102,40 +128,41 @@
 (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"'',
+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'',
+	'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]
+	'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'',
+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 -N -r1.13 -r1.13.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql	2 Dec 2013 08:56:13 -0000	1.13
+++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql	18 Aug 2014 20:37:48 -0000	1.13.2.1
@@ -105,42 +105,56 @@
 
 
 
-create or replace function as_action__new (integer,varchar,varchar,text,integer,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;
-	new__package_id         alias for $7;
+
+
+-- added
+select define_function_args('as_action__new','action_id,name,description,tcl_code,context_id,creation_user,package_id');
+
+--
+-- procedure as_action__new/7
+--
+CREATE OR REPLACE FUNCTION as_action__new(
+   new__action_id integer,
+   new__name varchar,
+   new__description varchar,
+   new__tcl_code text,
+   new__context_id integer,
+   new__creation_user integer,
+   new__package_id integer
+) RETURNS integer AS $$
+DECLARE 
 	v_action_id	     integer;
-begin
+BEGIN
 	v_action_id := acs_object__new (
 		new__action_id,
-		''as_action'',
+		'as_action',
 		now(),
 		new__creation_user,
 		null,
 		new__package_id,
-		''t''
+		't'
 	);
 	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';
+END;
+$$ LANGUAGE plpgsql;
 
 
 select define_function_args('as_action__del','action_id');
 
-create or replace function as_action__del (integer)
-returns integer as '
-declare 
-	del__action_id     alias for $1;
-begin
+
+
+--
+-- procedure as_action__del/1
+--
+CREATE OR REPLACE FUNCTION as_action__del(
+   del__action_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
 	
 		
 	delete from as_action_params where action_id=del__action_id;
@@ -150,7 +164,8 @@
         PERFORM acs_object__delete (del__action_id);	
 	return del__action_id;	
 
-end;' language 'plpgsql';	
+END;
+$$ LANGUAGE plpgsql;	
 	
 	
 
@@ -174,7 +189,7 @@
 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 
+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 ""].
@@ -252,4 +267,4 @@
 insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,'q','community_id','Community to add the user', 'select pretty_name,community_id from dotlrn_communities where community_id in (select object_id from acs_permissions_all where grantee_id=:user_id)');
 
 	return v_action_id;
-end; $$ language 'plpgsql';
+END; $$ language 'plpgsql';
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 -N -r1.3 -r1.3.12.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql	8 Feb 2005 17:57:09 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/assessment-checks-create.sql	18 Aug 2014 20:37:48 -0000	1.3.12.1
@@ -44,26 +44,34 @@
 
 
 
-create or replace function as_inter_item_check__new (integer,boolean,integer,integer,varchar,varchar,varchar,boolean,integer,integer,integer,integer)
-returns integer as '
-declare 
-	new__inter_item_check_id     alias for $1;
-        new__action_p                alias for $2;
-        new__section_id_from         alias for $3;
-        new__section_id_to           alias for $4;
-        new__check_sql               alias for $5;
-        new__name	  	     alias for $6;
-        new__description	     alias for $7;
-        new__postcheck_p	     alias for $8;
-        new__item_id                 alias for $9;
-	new__creation_user           alias for $10; 
-	new__context_id              alias for $11;
-	new__assessment_id	     alias for $12; 
+
+
+-- added
+select define_function_args('as_inter_item_check__new','inter_item_check_id,action_p,section_id_from,section_id_to,check_sql,name,description,postcheck_p,item_id,creation_user,context_id,assessment_id');
+
+--
+-- procedure as_inter_item_check__new/12
+--
+CREATE OR REPLACE FUNCTION as_inter_item_check__new(
+   new__inter_item_check_id integer,
+   new__action_p boolean,
+   new__section_id_from integer,
+   new__section_id_to integer,
+   new__check_sql varchar,
+   new__name varchar,
+   new__description varchar,
+   new__postcheck_p boolean,
+   new__item_id integer,
+   new__creation_user integer,
+   new__context_id integer,
+   new__assessment_id integer
+) RETURNS integer AS $$
+DECLARE 
 	v_inter_item_check_id	     integer;
-begin
+BEGIN
 	v_inter_item_check_id := acs_object__new (
 		new__inter_item_check_id,
-		''as_inter_item_check'',
+		'as_inter_item_check',
 		now(),
 		new__creation_user,
 		null,
@@ -74,13 +82,22 @@
         values (v_inter_item_check_id,new__action_p,new__section_id_from,new__section_id_to,new__check_sql,new__name,new__description,new__postcheck_p,new__item_id,new__assessment_id);
 
          return v_inter_item_check_id;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
-create or replace function as_inter_item_check__delete (integer)
-returns integer as '
-declare 
-	del__inter_item_check_id     alias for $1;
-begin
+
+
+-- added
+select define_function_args('as_inter_item_check__delete','inter_item_check_id');
+
+--
+-- procedure as_inter_item_check__delete/1
+--
+CREATE OR REPLACE FUNCTION as_inter_item_check__delete(
+   del__inter_item_check_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
 	delete from as_actions_log where 
 	inter_item_check_id = del__inter_item_check_id;
 	
@@ -92,6 +109,7 @@
         PERFORM acs_object__delete (del__inter_item_check_id);	
 	return del__inter_item_check_id;	
 
-end;' language 'plpgsql';	
+END;
+$$ LANGUAGE plpgsql;	
 	
 	
\ No newline at end of file
Index: openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql,v
diff -u -N -r1.19 -r1.19.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	10 Oct 2009 22:38:09 -0000	1.19
+++ openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	18 Aug 2014 20:37:48 -0000	1.19.2.1
@@ -147,14 +147,22 @@
 create index as_item_data_subject_id_idx on as_item_data (subject_id);
 create index as_item_data_as_item_id_idx on as_item_data (as_item_id);
 
-create or replace function as_item_data_ins_trg() returns trigger as '
-declare v_item_id integer;
-begin
+
+
+--
+-- procedure as_item_data_ins_trg/0
+--
+CREATE OR REPLACE FUNCTION as_item_data_ins_trg(
+
+) RETURNS trigger AS $$
+DECLARE v_item_id integer;
+BEGIN
 select item_id into v_item_id
 from cr_revisions where revision_id = NEW.as_item_id;
 NEW.as_item_cr_item_id = v_item_id;
 return NEW;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 create trigger as_item_data_ins_trg before insert on as_item_data for each row execute procedure as_item_data_ins_trg();
 
@@ -191,19 +199,27 @@
 
 create unique index as_item_data_choices_pk2 on as_item_data_choices (choice_id, item_data_id);
 
-create or replace function as_item_data_choices_ins_trg () returns trigger as '
-declare v_choice_value text default '''';
-begin
 
+
+--
+-- procedure as_item_data_choices_ins_trg/0
+--
+CREATE OR REPLACE FUNCTION as_item_data_choices_ins_trg(
+
+) RETURNS trigger AS $$
+DECLARE v_choice_value text default '';
+BEGIN
+
 select title into v_choice_value
 from cr_revisions
 where revision_id = NEW.choice_id;
 
-update as_item_data set choice_value = coalesce(choice_value,'''') || '' '' || coalesce(v_choice_value,'''') where item_data_id = new.item_data_id;
+update as_item_data set choice_value = coalesce(choice_value,'') || ' ' || coalesce(v_choice_value,'') where item_data_id = new.item_data_id;
 
 return NEW;
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 create trigger as_item_data_choices_ins_trg after insert on as_item_data_choices for each row execute procedure as_item_data_choices_ins_trg();
 
Index: openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql,v
diff -u -N -r1.6 -r1.6.12.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql	30 Jan 2005 14:16:14 -0000	1.6
+++ openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql	18 Aug 2014 20:37:48 -0000	1.6.12.1
@@ -11,20 +11,27 @@
 
 drop function as_inter_item_check__delete (integer);
 
-create function inline_0()
-returns integer as '
-declare
+
+
+--
+-- procedure inline_0/0
+--
+CREATE OR REPLACE FUNCTION inline_0(
+
+) RETURNS integer AS $$
+DECLARE
 	object_rec	record;
-begin 
+BEGIN 
 
 	-- drop objects
- 	for object_rec in select object_id from acs_objects where object_type = ''as_inter_item_check''
+ 	for object_rec in select object_id from acs_objects where object_type = 'as_inter_item_check'
 	loop
 		PERFORM acs_object__delete ( object_rec.object_id );
 	end loop;
 
 	return 0;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 select inline_0();
 
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d3-0.10d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d3-0.10d4.sql,v
diff -u -N -r1.1 -r1.1.12.1
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d3-0.10d4.sql	25 Jan 2005 22:05:34 -0000	1.1
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d3-0.10d4.sql	18 Aug 2014 20:37:48 -0000	1.1.12.1
@@ -127,25 +127,33 @@
 
 create sequence as_actions_log_action_log_id;
 
-create or replace function as_inter_item_check__new (integer,boolean,integer,integer,varchar,varchar,varchar,boolean,integer,integer,integer)
-returns integer as '
-declare 
-	new__inter_item_check_id     alias for $1;
-        new__action_p                alias for $2;
-        new__section_id_from         alias for $3;
-        new__section_id_to           alias for $4;
-        new__check_sql               alias for $5;
-        new__name	  	     alias for $6;
-        new__description	     alias for $7;
-        new__postcheck_p	     alias for $8;
-        new__item_id                 alias for $9;
-	new__creation_user           alias for $10; 
-	new__context_id              alias for $11; 
+
+
+-- added
+select define_function_args('as_inter_item_check__new','inter_item_check_id,action_p,section_id_from,section_id_to,check_sql,name,description,postcheck_p,item_id,creation_user,context_id');
+
+--
+-- procedure as_inter_item_check__new/11
+--
+CREATE OR REPLACE FUNCTION as_inter_item_check__new(
+   new__inter_item_check_id integer,
+   new__action_p boolean,
+   new__section_id_from integer,
+   new__section_id_to integer,
+   new__check_sql varchar,
+   new__name varchar,
+   new__description varchar,
+   new__postcheck_p boolean,
+   new__item_id integer,
+   new__creation_user integer,
+   new__context_id integer
+) RETURNS integer AS $$
+DECLARE 
 	v_inter_item_check_id	     integer;
-begin
+BEGIN
 	v_inter_item_check_id := acs_object__new (
 		new__inter_item_check_id,
-		''as_inter_item_check'',
+		'as_inter_item_check',
 		now(),
 		new__creation_user,
 		null,
@@ -156,13 +164,22 @@
         values (v_inter_item_check_id,new__action_p,new__section_id_from,new__section_id_to,new__check_sql,new__name,new__description,new__postcheck_p,new__item_id);
 
          return v_inter_item_check_id;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
-create or replace function as_inter_item_check__delete (integer)
-returns integer as '
-declare 
-	del__inter_item_check_id     alias for $1;
-begin
+
+
+-- added
+select define_function_args('as_inter_item_check__delete','inter_item_check_id');
+
+--
+-- procedure as_inter_item_check__delete/1
+--
+CREATE OR REPLACE FUNCTION as_inter_item_check__delete(
+   del__inter_item_check_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
 	delete from as_actions_log where 
 	inter_item_check_id = del__inter_item_check_id;
 	
@@ -174,6 +191,7 @@
         PERFORM acs_object__delete (del__inter_item_check_id);	
 	return del__inter_item_check_id;	
 
-end;' language 'plpgsql';	
+END;
+$$ LANGUAGE plpgsql;	
 	
 	
\ No newline at end of file
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 -N -r1.2 -r1.2.12.1
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.10d6-0.10d7.sql	14 Feb 2005 18:39:30 -0000	1.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
@@ -19,41 +19,58 @@
 
 
 
-create or replace function as_action__new (integer,varchar,varchar,text,integer,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;
-	new__package_id         alias for $7;
+
+
+-- added
+select define_function_args('as_action__new','action_id,name,description,tcl_code,context_id,creation_user,package_id');
+
+--
+-- procedure as_action__new/7
+--
+CREATE OR REPLACE FUNCTION as_action__new(
+   new__action_id integer,
+   new__name varchar,
+   new__description varchar,
+   new__tcl_code text,
+   new__context_id integer,
+   new__creation_user integer,
+   new__package_id integer
+) RETURNS integer AS $$
+DECLARE 
 	v_action_id	     integer;
-begin
+BEGIN
 	v_action_id := acs_object__new (
 		new__action_id,
-		''as_action'',
+		'as_action',
 		now(),
 		new__creation_user,
 		null,
 		new__package_id,
-		''t''
+		't'
 	);
 	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';
+END;
+$$ LANGUAGE plpgsql;
 
 
 
-create or replace function as_action__delete (integer)
-returns integer as '
-declare 
-	del__action_id     alias for $1;
-begin
+
+
+-- added
+select define_function_args('as_action__delete','action_id');
+
+--
+-- procedure as_action__delete/1
+--
+CREATE OR REPLACE FUNCTION as_action__delete(
+   del__action_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
 	
 		
 	delete from as_action_params where action_id=del__action_id;
@@ -62,26 +79,35 @@
         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,integer)
-returns integer as '
-declare 
-	new__context_id		alias for $1;
-	new__creation_user	alias for $2;
-	new__package_id		alias for $3;
+
+
+-- added
+select define_function_args('as_action__default_actions','context_id,creation_user,package_id');
+
+--
+-- procedure as_action__default_actions/3
+--
+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'',
-		''Register new users'',
-		''set password [ad_generate_random_string] 
+		'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]
 }
@@ -100,53 +126,54 @@
 (you may change your password after you log in)
 Thank you,
 $administration_name"
-ns_sendmail "$email" "$admin_email" "You have been added as a user to [ad_system_name] at [ad_url]" "$message"'',
+ns_sendmail "$email" "$admin_email" "You have been added as a user to [ad_system_name] at [ad_url]" "$message"',
 	new__package_id,
 	new__creation_user,
 	new__package_id
 	);
 
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,''n'',''first_names'',''First Names of the User'');
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,''n'',''last_name'',''Last Name of the User'');
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,''n'',''email'',''Email of the User'');
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,''n'',''user_name'',''User name of the User'');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,'n','first_names','First Names of the User');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,'n','last_name','Last Name of the User');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_parameter_id,v_action_id,'n','email','Email of the User');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description) values (v_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'',
+	'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__package_id,
 	new__creation_user,
 	new__package_id
 	);
 
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,''q'',''event_id'',''Event to add the user'', ''select event_id,event_id from acs_events'');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_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]
+	'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'',
+dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id',
 	new__package_id,
 	new__creation_user,
 	new__package_id
 	);
 
-v_parameter_id:= nextval(''as_action_params_parameter_id'');
-insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,''q'',''community_id'',''Community to add the user'', ''select pretty_name,community_id from dotlrn_communities'');
+v_parameter_id:= nextval('as_action_params_parameter_id');
+insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,'q','community_id','Community to add the user', 'select pretty_name,community_id from dotlrn_communities');
 
 	return v_action_id;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 
 create table del_actions (
@@ -168,17 +195,23 @@
 
 
 
-create or replace function as_action__create_action_object ()
-returns integer as '
-declare 
+
+
+--
+-- procedure as_action__create_action_object/0
+--
+CREATE OR REPLACE FUNCTION as_action__create_action_object(
+
+) RETURNS integer AS $$
+DECLARE 
 	v_action_id	integer;
 	v_parameter_id	integer;
 	package		RECORD;
 	action		RECORD;
 	param		RECORD;
 	check		RECORD;
 	del_actions 	RECORD;
-begin
+BEGIN
 	
 	FOR action IN SELECT * from as_actions LOOP
 		insert into del_actions (action_id,tcl_code,name,description) values (action.action_id,action.tcl_code,action.name,action.description);
@@ -194,15 +227,15 @@
 
 	alter table as_actions add constraint as_actions_action_id_fk foreign key (action_id) references acs_objects(object_id);  
 
-	FOR package IN SELECT apm.package_id,o.context_id,o.creation_user from apm_packages apm, acs_objects o where o.object_id=apm.package_id and apm.package_key = ''assessment'' LOOP
+	FOR package IN SELECT apm.package_id,o.context_id,o.creation_user from apm_packages apm, acs_objects o where o.object_id=apm.package_id and apm.package_key = 'assessment' LOOP
 
 		FOR action IN SELECT * from del_actions LOOP
 	
 			v_action_id:= as_action__new (null,action.name,action.description,action.tcl_code,package.package_id,package.creation_user,package.package_id);
 
 			FOR param IN SELECT * from del_params where action_id=action.action_id LOOP
 			
-				v_parameter_id:=nextval(''as_action_params_parameter_id'');		
+				v_parameter_id:=nextval('as_action_params_parameter_id');		
 				insert into as_action_params (parameter_id,type,query,description,varname,action_id) values (v_parameter_id,param.type,param.query,param.description,param.varname,v_action_id);
 
 
@@ -226,5 +259,6 @@
 	return v_action_id;
 
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d3-0.22d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d3-0.22d4.sql,v
diff -u -N -r1.3 -r1.3.6.1
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d3-0.22d4.sql	7 Oct 2007 22:36:54 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d3-0.22d4.sql	18 Aug 2014 20:37:48 -0000	1.3.6.1
@@ -99,11 +99,16 @@
 
 select define_function_args ('as_action__del','action_id');
 
-create or replace function as_action__del (integer)
-returns integer as '
-declare 
-        del__action_id     alias for $1;
-begin
+
+
+--
+-- procedure as_action__del/1
+--
+CREATE OR REPLACE FUNCTION as_action__del(
+   del__action_id integer
+) RETURNS integer AS $$
+DECLARE 
+BEGIN
         
                 
         delete from as_action_params where action_id=del__action_id;
@@ -113,7 +118,8 @@
         PERFORM acs_object__delete (del__action_id);    
         return del__action_id;  
 
-end;' language 'plpgsql';       
+END;
+$$ LANGUAGE plpgsql;       
 
 alter table as_session_items drop constraint as_session_items_item_fk;
 alter table as_session_items drop constraint as_session_items_section_fk;
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d1-0.23d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d1-0.23d2.sql,v
diff -u -N -r1.3 -r1.3.4.1
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d1-0.23d2.sql	6 Jul 2009 12:04:22 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d1-0.23d2.sql	18 Aug 2014 20:37:49 -0000	1.3.4.1
@@ -2,46 +2,70 @@
 alter table as_item_data add as_item_cr_item_id integer;
 alter table as_item_data add choice_value text;
 
-create or replace function as_item_data_ins_trg() returns trigger as '
-declare v_item_id integer;
-begin
+
+
+--
+-- procedure as_item_data_ins_trg/0
+--
+CREATE OR REPLACE FUNCTION as_item_data_ins_trg(
+
+) RETURNS trigger AS $$
+DECLARE v_item_id integer;
+BEGIN
 select item_id into v_item_id
 from cr_revisions where revision_id = NEW.as_item_id;
 NEW.as_item_cr_item_id = v_item_id;
 return NEW;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
-create or replace function as_item_data_choices_ins_trg () returns trigger as '
-declare v_choice_value text default '''';
-begin
 
+
+--
+-- procedure as_item_data_choices_ins_trg/0
+--
+CREATE OR REPLACE FUNCTION as_item_data_choices_ins_trg(
+
+) RETURNS trigger AS $$
+DECLARE v_choice_value text default '';
+BEGIN
+
 select title into v_choice_value
 from as_item_choicesx
 where choice_id = NEW.choice_id;
 
-update as_item_data set choice_value = coalesce(choice_value,'''') || '' '' || coalesce(v_choice_value,'''') where item_data_id = new.item_data_id;
+update as_item_data set choice_value = coalesce(choice_value,'') || ' ' || coalesce(v_choice_value,'') where item_data_id = new.item_data_id;
 
 return NEW;
 
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
-create or replace function as_item_data_choices_upd_trg() returns trigger as '
-declare v_choice_value text default '''';
+
+
+--
+-- procedure as_item_data_choices_upd_trg/0
+--
+CREATE OR REPLACE FUNCTION as_item_data_choices_upd_trg(
+
+) RETURNS trigger AS $$
+DECLARE v_choice_value text default '';
 declare v_row record;
-begin
+BEGIN
 
 for v_row in select title as text_value from
     as_item_choicesx c,
     as_item_data_choices dc
     where dc.item_data_id = new.item_data_id and
     c.choice_id = dc.choice_id
 loop
-    v_choice_value := v_choice_value || '' '' || coalesce(v_row.text_value,'''');
+    v_choice_value := v_choice_value || ' ' || coalesce(v_row.text_value,'');
 end loop;
 
-update as_item_data set choice_value = coalesce(choice_value,'''') || '' '' || coalesce(v_choice_value,'''') where item_data_id = new.item_data_id;
+update as_item_data set choice_value = coalesce(choice_value,'') || ' ' || coalesce(v_choice_value,'') where item_data_id = new.item_data_id;
 return NEW;
-end;' language 'plpgsql';
+END;
+$$ LANGUAGE plpgsql;
 
 create trigger as_item_data_ins_trg before insert on as_item_data for each row execute procedure as_item_data_ins_trg();
 create trigger as_item_data_upd_trg before update on as_item_data for each row execute procedure as_item_data_ins_trg();
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 -N -r1.1 -r1.1.2.1
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql	2 Dec 2013 08:56:13 -0000	1.1
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.23d3-0.23d4.sql	18 Aug 2014 20:37:49 -0000	1.1.2.1
@@ -20,7 +20,7 @@
 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 
+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 ""].
@@ -98,4 +98,4 @@
 insert into as_action_params (parameter_id, action_id,type, varname, description,query) values (v_parameter_id,v_action_id,'q','community_id','Community to add the user', 'select pretty_name,community_id from dotlrn_communities where community_id in (select object_id from acs_permissions_all where grantee_id=:user_id)');
 
 	return v_action_id;
-end; $$ language 'plpgsql';
+END; $$ language 'plpgsql';