Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v diff -u -r1.50.2.7 -r1.50.2.8 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 21 Dec 2004 18:22:30 -0000 1.50.2.7 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 6 Jan 2005 16:31:29 -0000 1.50.2.8 @@ -1020,8 +1020,8 @@ 6) delete keyword associations 7) delete all associated comments */ -select define_function_args('content_item__delete','item_id'); -create or replace function content_item__delete (integer) +select define_function_args('content_item__del','item_id'); +create or replace function content_item__del (integer) returns integer as ' declare delete__item_id alias for $1; @@ -1145,6 +1145,16 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__delete','item_id'); +create or replace function content_item__delete (integer) +returns integer as ' +declare + delete__item_id alias for $1; +begin + PERFORM content_item__del (delete__item_id); + return 0; +end;' language 'plpgsql'; + select define_function_args('content_item__edit_name','item_id,name'); create or replace function content_item__edit_name (integer,varchar) returns integer as ' Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql,v diff -u -r1.35.2.1 -r1.35.2.2 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 21 Dec 2004 18:22:30 -0000 1.35.2.1 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 6 Jan 2005 16:31:29 -0000 1.35.2.2 @@ -329,7 +329,7 @@ -- procedure delete -select define_function_args('content_revision__delete','revision_id'); +select define_function_args('content_revision__del','revision_id'); create or replace function content_revision__delete (integer) returns integer as ' declare @@ -392,7 +392,18 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_revision__delete','revision_id'); +create or replace function content_revision__delete (integer) +returns integer as ' +declare + delete__revision_id alias for $1; +begin + PERFORM content_revision__del(delete__revision_id); + return 0; +end;' language 'plpgsql'; + + -- function get_number select define_function_args('content_revision__get_number','revision_id'); create or replace function content_revision__get_number (integer) Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 4 Mar 2004 14:52:36 -0000 1.14 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 6 Jan 2005 16:31:29 -0000 1.14.2.1 @@ -36,7 +36,7 @@ -- function new -select define_function_args('content_template__new','name,parent_id,template_id,creation_date,creation_user,creation_ip'); +select define_function_args('content_template__new','name,parent_id,template_id,creation_date;now,creation_user,creation_ip'); create or replace function content_template__new (varchar,integer,integer,timestamptz,integer,varchar) returns integer as '