Index: openacs-4/packages/contacts-lite/contacts-lite.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts-lite/contacts-lite.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/contacts-lite/contacts-lite.info 23 Jan 2021 00:03:52 -0000 1.2 +++ openacs-4/packages/contacts-lite/contacts-lite.info 8 Jul 2021 20:23:34 -0000 1.3 @@ -7,15 +7,15 @@ <initial-install-p>f</initial-install-p> <singleton-p>f</singleton-p> - <version name="0.3d" url="http://openacs.org/repository/download/apm/contacts-lite-0.3d.apm"> + <version name="0.3d1" url="http://openacs.org/repository/download/apm/contacts-lite-0.3d1.apm"> <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner> <summary>This is a simple contact database</summary> <release-date>2002-06-11</release-date> <vendor url="www.mayuli.com">Mayuli Enterprises LLC</vendor> <description format="text/plain">This is a simple contact database. It doesn't include all the features of ACT, but it does the job for most people.</description> - <provides url="contacts-lite" version="0.3d"/> + <provides url="contacts-lite" version="0.3d1"/> <requires url="acs-kernel" version="4.1"/> <requires url="acs-reference" version="0.2d"/> <requires url="ref-countries" version="0.1d"/> Index: openacs-4/packages/contacts-lite/sql/postgresql/cn-addresses-plsql.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts-lite/sql/postgresql/cn-addresses-plsql.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/contacts-lite/sql/postgresql/cn-addresses-plsql.sql 20 Jan 2021 21:07:14 -0000 1.3 +++ openacs-4/packages/contacts-lite/sql/postgresql/cn-addresses-plsql.sql 8 Jul 2021 20:23:35 -0000 1.4 @@ -95,7 +95,6 @@ ) RETURNS integer AS $$ DECLARE - v_address_id cn_addresses.address_id%TYPE; BEGIN v_address_id := acs_object__new ( @@ -124,23 +123,27 @@ END; $$ LANGUAGE plpgsql; -create or replace function cn_address__del (integer) -returns integer as ' -declare - p_address_id alias for $1; - v_return integer := 0; -begin + +select define_function_args('cn_address__del','address_id'); + +CREATE OR REPLACE FUNCTION cn_address__del ( + p_address_id integer +) RETURNS integer AS $$ +DECLARE + v_return cn_addresses.address_id%TYPE := 0; +BEGIN delete from acs_permissions where object_id = p_address_id; delete from cn_addresses where address_id = p_address_id; - raise NOTICE ''Deleting cn_address...''; + raise NOTICE 'Deleting cn_address...'; return v_return; -end;' language 'plpgsql'; +END; +$$ language plpgsql;