Index: openacs-4/contrib/obsolete-packages/acs-content/sql/oracle/acs-content-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-content/sql/oracle/acs-content-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/acs-content/sql/oracle/acs-content-create.sql 12 May 2002 20:57:01 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/acs-content/sql/oracle/acs-content-create.sql 30 Sep 2003 12:10:00 -0000 1.3 @@ -37,7 +37,7 @@ content in acs_contents.content%TYPE default empty_blob() ); - procedure delete ( + procedure del ( content_id in acs_contents.content_id%TYPE ); @@ -87,14 +87,14 @@ ); end new; - procedure delete ( + procedure del ( content_id in acs_contents.content_id%TYPE ) is begin delete from acs_contents - where content_id = acs_content.delete.content_id; - end delete; + where content_id = acs_content.del.content_id; + end del; -- update language column procedure update_nls_language ( Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql 12 Feb 2002 01:35:16 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-body.sql 30 Sep 2003 12:10:00 -0000 1.5 @@ -286,38 +286,38 @@ end start_case; - procedure delete( + procedure del ( case_id in number ) is v_workflow_case_table varchar2(30); begin /* delete attribute_value_audit, tokens, tasks */ - delete from wf_attribute_value_audit where case_id = workflow_case.delete.case_id; - delete from wf_case_assignments where case_id = workflow_case.delete.case_id; - delete from wf_case_deadlines where case_id = workflow_case.delete.case_id; - delete from wf_tokens where case_id = workflow_case.delete.case_id; - delete from wf_task_assignments where task_id in (select task_id from wf_tasks where case_id = workflow_case.delete.case_id); - delete from wf_tasks where case_id = workflow_case.delete.case_id; + delete from wf_attribute_value_audit where case_id = workflow_case.del.case_id; + delete from wf_case_assignments where case_id = workflow_case.del.case_id; + delete from wf_case_deadlines where case_id = workflow_case.del.case_id; + delete from wf_tokens where case_id = workflow_case.del.case_id; + delete from wf_task_assignments where task_id in (select task_id from wf_tasks where case_id = workflow_case.del.case_id); + delete from wf_tasks where case_id = workflow_case.del.case_id; /* delete the journal */ - journal_entry.delete_for_object(workflow_case.delete.case_id); + journal_entry.delete_for_object(workflow_case.del.case_id); /* delete from the workflow-specific cases table */ select table_name into v_workflow_case_table from acs_object_types ot, wf_cases c - where c.case_id = workflow_case.delete.case_id + where c.case_id = workflow_case.del.case_id and object_type = c.workflow_key; execute immediate 'delete from '||v_workflow_case_table||' where case_id = :case_id' - using in workflow_case.delete.case_id; + using in workflow_case.del.case_id; /* delete from the generic cases table */ - delete from wf_cases where case_id = workflow_case.delete.case_id; + delete from wf_cases where case_id = workflow_case.del.case_id; /* delete from acs-objects */ - acs_object.delete(workflow_case.delete.case_id); - end delete; + acs_object.del(workflow_case.del.case_id); + end del; procedure suspend( Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-head.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-head.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-head.sql 3 Jan 2002 00:58:44 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package-head.sql 30 Sep 2003 12:10:00 -0000 1.3 @@ -48,7 +48,7 @@ msg in varchar2 default null ); - procedure delete( + procedure del ( case_id in number ); Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-package-body.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-package-body.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-package-body.sql 19 Nov 2001 18:17:46 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-package-body.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -126,7 +126,7 @@ cursor workflow_cases is select case_id from wf_cases where workflow_key = delete_cases.workflow_key; begin for case_rec in workflow_cases loop - workflow_case.delete(case_rec.case_id); + workflow_case.del(case_rec.case_id); end loop; end delete_cases; Index: openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-packages.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-packages.sql 28 Aug 2003 09:41:46 -0000 1.6 +++ openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-packages.sql 30 Sep 2003 12:10:00 -0000 1.7 @@ -27,7 +27,7 @@ object_type in acs_objects.object_type%TYPE default 'bboard_forum' ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( forum_id in bboard_forums.forum_id%TYPE ); @@ -75,7 +75,7 @@ object_type in acs_objects.object_type%TYPE default 'bboard_category' ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( category_id in bboard_categories.category_id%TYPE ); @@ -227,15 +227,15 @@ return v_forum_id; end new; - procedure delete ( + procedure del ( forum_id in bboard_forums.forum_id%TYPE ) is begin delete from bboard_forums - where forum_id = bboard_forum.delete.forum_id; - acs_object.delete(forum_id); - end delete; + where forum_id = bboard_forum.del.forum_id; + acs_object.del(forum_id); + end del; procedure set_attrs ( forum_id in bboard_forums.forum_id%TYPE, @@ -363,15 +363,15 @@ return v_category_id; end new; - procedure delete ( + procedure del ( category_id in bboard_categories.category_id%TYPE ) is begin delete from bboard_categories - where category_id = bboard_category.delete.category_id; - acs_object.delete(category_id); - end delete; + where category_id = bboard_category.del.category_id; + acs_object.del(category_id); + end del; procedure set_attrs ( category_id in bboard_categories.category_id%TYPE, @@ -650,7 +650,7 @@ begin for child_val in messages_children loop if child_val.object_type = 'bboard_message' then - acs_message.delete(child_val.child_id); + acs_message.del(child_val.child_id); elsif child_val.object_type = 'content_item' then select count(*) into image_p from images @@ -664,7 +664,7 @@ end loop; for message_val in messages loop - acs_message.delete(message_val.message_id); + acs_message.del(message_val.message_id); end loop; end remove_thread; @@ -681,7 +681,7 @@ begin for child_val in messages_children loop if child_val.object_type = 'bboard_message' then - acs_message.delete(child_val.child_id); + acs_message.del(child_val.child_id); elsif child_val.object_type = 'content_item' then select count(*) into image_p from images @@ -694,7 +694,7 @@ end if; end loop; - acs_message.delete(message_id); + acs_message.del(message_id); end remove; end bboard_message; Index: openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2-oracle.xql 28 Aug 2003 09:41:47 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2-oracle.xql 30 Sep 2003 12:10:00 -0000 1.4 @@ -7,7 +7,7 @@ begin - bboard_category.delete (:category_id); + bboard_category.del (:category_id); end; Index: openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2.tcl 28 Aug 2003 09:41:47 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/bboard/www/category-delete-2.tcl 30 Sep 2003 12:10:00 -0000 1.5 @@ -18,8 +18,8 @@ db_exec_plsql delete_category { begin - bboard_category.delete (:category_id); + bboard_category.del (:category_id); end; } -ad_returnredirect "forum?forum_id=$forum_id" \ No newline at end of file +ad_returnredirect "forum?forum_id=$forum_id" Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-delete-2-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/bboard/www/forum-delete-2-oracle.xql 28 Aug 2003 09:41:47 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/bboard/www/forum-delete-2-oracle.xql 30 Sep 2003 12:10:00 -0000 1.4 @@ -17,7 +17,7 @@ delete from acs_permissions where object_id = category_val.category_id; - bboard_category.delete(category_val.category_id); + bboard_category.del(category_val.category_id); end loop; end; @@ -29,7 +29,7 @@ begin - bboard_forum.delete (:forum_id); + bboard_forum.del (:forum_id); end; Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-create.sql 17 Oct 2001 19:44:08 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-create.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -181,7 +181,7 @@ context_id in acs_objects.context_id%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( mp3_id in mp3_mp3s.mp3_id%TYPE ); @@ -248,14 +248,14 @@ - procedure delete ( + procedure del ( mp3_id in mp3_mp3s.mp3_id%TYPE ) is begin - delete from mp3_mp3s where mp3_id = mp3.delete.mp3_id; - acs_object.delete(mp3_id); - end delete; + delete from mp3_mp3s where mp3_id = mp3.del.mp3_id; + acs_object.del(mp3_id); + end del; @@ -291,7 +291,7 @@ context_id in acs_objects.context_id%TYPE ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( playlist_id in mp3_playlists.playlist_id%TYPE ); @@ -356,26 +356,26 @@ return v_playlist_id; end new; - procedure delete ( + procedure del ( playlist_id in mp3_playlists.playlist_id%TYPE ) is begin delete from mp3_votes - where playlist_id = mp3_playlist.delete.playlist_id; + where playlist_id = mp3_playlist.del.playlist_id; delete from mp3_mp3_playlist_map - where playlist_id = mp3_playlist.delete.playlist_id; + where playlist_id = mp3_playlist.del.playlist_id; delete from mp3_playlists - where playlist_id = mp3_playlist.delete.playlist_id; - acs_object.delete(playlist_id); - end delete; + where playlist_id = mp3_playlist.del.playlist_id; + acs_object.del(playlist_id); + end del; -- Note: item_add uses "insert after" ordering, so "order" points to -- the last record _not_ to be updated procedure item_add ( mp3_id in mp3_mp3s.mp3_id%TYPE, playlist_id in mp3_playlists.playlist_id%TYPE, - sort_key in mp3_mp3_playlist_map.sort_key%TYPE default 0 + sort_key in mp3_mp3_playlist_map.sort_key%TYPE default null ) is cursor map_cur is Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-drop.sql 17 Oct 2001 19:44:08 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/mp3-jukebox/sql/oracle/mp3-jukebox-drop.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -38,10 +38,10 @@ select mp3_id from mp3_mp3s; begin for play_rec in play_cur loop - mp3_playlist.delete(play_rec.playlist_id); + mp3_playlist.del(play_rec.playlist_id); end loop; for mp3_rec in mp3_cur loop - mp3.delete(mp3_rec.mp3_id); + mp3.del(mp3_rec.mp3_id); end loop; end; / @@ -64,4 +64,4 @@ acs_object_type.drop_type ('mp3'); end; / -show errors \ No newline at end of file +show errors Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete-2-oracle.xql 17 Oct 2001 19:44:08 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete-2-oracle.xql 30 Sep 2003 12:10:00 -0000 1.2 @@ -7,7 +7,7 @@ begin - mp3_playlist.delete ( + mp3_playlist.del ( playlist_id => :playlist_id ); end; Index: openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/cleanup-failed-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/cleanup-failed-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/cleanup-failed-drop.sql 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/cleanup-failed-drop.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -17,12 +17,12 @@ execute immediate 'begin for message in (select comment_id as id from general_comments where object_id = ' || photo.id || ') loop - acs_message.delete(message.id); + acs_message.del(message.id); end loop; end;'; end if; delete from acs_permissions where object_id = photo.id; - acs_object.delete(photo.id); + acs_object.del(photo.id); end loop; acs_object_type.drop_type('pl_photo'); end; @@ -41,7 +41,7 @@ begin for folder in cur loop delete from acs_permissions where object_id = folder.id; - acs_object.delete(folder.id); + acs_object.del(folder.id); end loop; acs_object_type.drop_type('pl_folder'); end; Index: openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-drop.sql 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-drop.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -33,11 +33,11 @@ execute immediate 'begin for message in (select comment_id as id from general_comments where object_id = ' || v_id || ') loop - acs_message.delete(message.id); + acs_message.del(message.id); end loop; end;'; end if; - acs_object.delete (v_id); + acs_object.del (v_id); end loop; close cur1; @@ -46,7 +46,7 @@ fetch cur2 into v_id; exit when cur2%NOTFOUND; delete from acs_permissions where object_id = v_id; - acs_object.delete (v_id); + acs_object.del (v_id); end loop; end; Index: openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-plsql.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-plsql.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-plsql.sql 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/photo-album-lite/sql/oracle/photo-album-lite-plsql.sql 30 Sep 2003 12:10:00 -0000 1.2 @@ -60,7 +60,7 @@ photo_id in pl_photos.photo_id%TYPE ); - procedure delete ( + procedure del ( photo_id in pl_photos.photo_id%TYPE ); end pl_photo; @@ -236,14 +236,14 @@ where photo_id = pl_photo.apply_default_name.photo_id; end apply_default_name; - procedure delete ( + procedure del ( photo_id in pl_photos.photo_id%TYPE ) is begin delete from pl_photos - where photo_id = pl_photo.delete.photo_id; - end delete; + where photo_id = pl_photo.del.photo_id; + end del; end pl_photo; / @@ -276,7 +276,7 @@ folder_id in pl_folders.folder_id%TYPE ) return pl_folders.title%TYPE; - procedure delete ( + procedure del ( folder_id in pl_folders.folder_id%TYPE ); @@ -360,13 +360,13 @@ return 'Folder: ' || v_title; end; - procedure delete ( + procedure del ( folder_id in pl_folders.folder_id%TYPE ) is begin - delete from pl_folders where folder_id = pl_folder.delete.folder_id; - end delete; + delete from pl_folders where folder_id = pl_folder.del.folder_id; + end del; end pl_folder; / Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-drop.sql 4 Jun 2001 16:53:27 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-drop.sql 30 Sep 2003 12:10:00 -0000 1.3 @@ -32,17 +32,17 @@ begin -- delete all comments on tickets for comment_rec in comment_cur loop - acs_message.delete(comment_rec.comment_id); + acs_message.del(comment_rec.comment_id); end loop; -- delete all tickets for ticket_rec in ticket_cur loop - ttracker_ticket.delete(ticket_rec.ticket_id); + ttracker_ticket.del(ticket_rec.ticket_id); end loop; -- delete all categories for category_rec in category_cur loop - ttracker_category.delete(category_rec.category_id); + ttracker_category.del(category_rec.category_id); end loop; acs_object_type.drop_type ('ttracker_ticket'); Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql,v diff -u -N -r1.10 -r1.11 --- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql 13 Mar 2002 22:50:53 -0000 1.10 +++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql 30 Sep 2003 12:10:00 -0000 1.11 @@ -31,7 +31,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return ttracker_tickets.ticket_id%TYPE; - procedure delete ( + procedure del ( ticket_id in ttracker_tickets.ticket_id%TYPE ); @@ -76,7 +76,7 @@ description in ttracker_categories.description%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( category_id in ttracker_categories.category_id%TYPE ); @@ -269,7 +269,7 @@ return v_ticket_id; end new; - procedure delete ( + procedure del ( ticket_id in ttracker_tickets.ticket_id%TYPE ) is @@ -285,12 +285,12 @@ -- delete the workflow case that's associated with this ticket if case_cur%FOUND then - workflow_case.delete(case_rec.case_id); + workflow_case.del(case_rec.case_id); end if; close case_cur; - acs_message.delete(ticket_id); - end delete; + acs_message.del(ticket_id); + end del; function name ( ticket_id in ttracker_tickets.ticket_id%TYPE @@ -377,7 +377,7 @@ return v_category_id; end new; - procedure delete ( + procedure del ( category_id in ttracker_categories.category_id%TYPE ) is @@ -386,14 +386,14 @@ -- check if any ticket exists for this category before deleting select decode(count(ticket_id), 0, 0, 1) into v_ticket_number from ttracker_tickets - where category_id = ttracker_category.delete.category_id; + where category_id = ttracker_category.del.category_id; if v_ticket_number > 0 then raise_application_error(-20000, 'Invalid severity.'); end if; - acs_object.delete(category_id); - end delete; + acs_object.del(category_id); + end del; function name ( category_id in ttracker_categories.category_id%TYPE Index: openacs-4/contrib/obsolete-packages/ticket-tracker-lite/sql/oracle/views-and-plsql.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker-lite/sql/oracle/views-and-plsql.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/ticket-tracker-lite/sql/oracle/views-and-plsql.sql 19 Mar 2002 06:49:29 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/ticket-tracker-lite/sql/oracle/views-and-plsql.sql 30 Sep 2003 12:10:00 -0000 1.3 @@ -139,7 +139,7 @@ select max(item_id) into v_item_id from cr_items where name = p_name; if v_item_id is not null then - content_item.delete(v_item_id); + content_item.del(v_item_id); end if; -- vinodk: this needs to be rewritten to use CR API Index: openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/delete-file-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/delete-file-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/delete-file-oracle.xql 19 Mar 2002 06:49:29 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/delete-file-oracle.xql 30 Sep 2003 12:10:01 -0000 1.2 @@ -7,7 +7,7 @@ begin - content_item.delete(:item_id); + content_item.del(:item_id); end; Index: openacs-4/contrib/obsolete-packages/wap/sql/oracle/wap-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/sql/oracle/wap-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/wap/sql/oracle/wap-create.sql 9 May 2001 18:54:48 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/wap/sql/oracle/wap-create.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -73,7 +73,7 @@ v_creation_ip in acs_objects.creation_ip%TYPE ) return wap_user_agents.user_agent_id%TYPE; - procedure delete ( + procedure del ( v_user_agent_id in wap_user_agents.user_agent_id%TYPE ); @@ -123,15 +123,15 @@ return new_id; end new; - procedure delete ( + procedure del ( v_user_agent_id in wap_user_agents.user_agent_id%TYPE ) is begin delete from wap_user_agents where user_agent_id = v_user_agent_id; - acs_object.delete(v_user_agent_id); - end delete; + acs_object.del(v_user_agent_id); + end del; procedure toggle_active_p ( v_user_agent_id in wap_user_agents.user_agent_id%TYPE @@ -236,4 +236,4 @@ - \ No newline at end of file + Index: openacs-4/contrib/obsolete-packages/wap/tcl/wap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wap/tcl/wap-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/wap/tcl/wap-procs.tcl 18 Sep 2002 14:55:02 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/wap/tcl/wap-procs.tcl 30 Sep 2003 12:10:01 -0000 1.4 @@ -67,7 +67,7 @@ tcl wrapper for deleting WAP user agent } { db_dml "delete_user_agent" "begin - wap_user_agent.delete($user_agent_id); + wap_user_agent.del($user_agent_id); end;" return Index: openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/oracle/wf-ticket-tracker-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/oracle/wf-ticket-tracker-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/oracle/wf-ticket-tracker-create.sql 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/oracle/wf-ticket-tracker-create.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -39,7 +39,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return integer; - procedure delete ( + procedure del ( ticket_id in wf_tickets.ticket_id%TYPE ); @@ -95,13 +95,13 @@ return v_ticket_id; end; - procedure delete ( + procedure del ( ticket_id in wf_tickets.ticket_id%TYPE ) is begin - delete from wf_tickets where ticket_id = wf_ticket.delete.ticket_id; - acs_object.delete(wf_ticket.delete.ticket_id); + delete from wf_tickets where ticket_id = wf_ticket.del.ticket_id; + acs_object.del(wf_ticket.del.ticket_id); end; function name ( Index: openacs-4/contrib/packages/general-comments/sql/oracle/general-comments-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/sql/oracle/Attic/general-comments-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/general-comments/sql/oracle/general-comments-drop.sql 2 May 2003 15:49:13 -0000 1.1 +++ openacs-4/contrib/packages/general-comments/sql/oracle/general-comments-drop.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -37,7 +37,7 @@ from cr_items where parent_id = comment_rec.comment_id); - acs_message.delete(comment_rec.comment_id); + acs_message.del(comment_rec.comment_id); end loop; end; / Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v diff -u -N -r1.13 -r1.14 --- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 15 Sep 2003 23:09:56 -0000 1.13 +++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 30 Sep 2003 12:10:01 -0000 1.14 @@ -1,19 +1,18 @@ -- TODO: -- +-- which items in this data model need to use the content repository? -- need to add in workflow (for status among other things) +-- need to take into account acs-rels -- add categories to projects -- --- packages/project-manager/sql/postgresql/project-manager-table-create.sql +-- packages/test-project/sql/postgresql/test-project-table-create.sql -- --- @author jader@bread.com --- @author ncarroll@ee.usyd.edu.au was involved in creating the initial CR version --- @author everyone else involved in this thread: http://openacs.org/forums/message-view?message_id=90742 +-- @author jader@bread.com, ncarroll@ee.usyd.edu.au and everyone else involved in this thread: http://openacs.org/forums/message-view?message_id=90742 -- @creation-date 2003-05-15 -- --- PROJECTS - +-- Project repository datamodel. create table pm_projects ( project_id integer constraint project_manager_id_fk @@ -54,82 +53,65 @@ --- ROLES - -create sequence pm_role_seq start 3; - -create table pm_roles ( +create table pm_project_roles ( role_id integer - constraint pm_role_id_pk + constraint pm_project_role_id_pk primary key, one_line varchar(100) - constraint pm_role_one_line_uq + constraint pm_project_role_one_line_uq unique, description varchar(2000), - sort_order integer, - is_observer_p char(1) default 'f' - constraint pm_role_is_observer_ck - check (is_observer_p in ('t','f')) + sort_order integer ); -comment on table pm_roles is ' - Roles represent the way in which a party participates in a project - or task. For example, they could be a manager, or client, or - participant.. The sort order determines what order it is displayed - in. The is_observer_p specifies whether they are directly - responsible for the task. People not directly responsible will not - get email notifications reminding them that tasks are overdue, for - example. +comment on table pm_project_roles is ' + Roles represent the way in which a party participates in a project. For example, + they could be a manager, or client, or participant.. The sort order determines + what order it is displayed in. '; -insert into pm_roles (role_id, one_line, description, sort_order) values ('1','Participant','Team members who are responsible for the completion of the project','10'); -insert into pm_roles (role_id, one_line, description, sort_order) values ('2','Manager','Manages the team to complete the project or task on time and on budget.','20'); +insert into pm_project_roles (role_id, one_line, description, sort_order) values ('1','Participant','Team members who are responsible for the completion of the project','10'); +insert into pm_project_roles (role_id, one_line, description, sort_order) values ('2','Manager','Manages the team to complete the project on time and on budget.','20'); -create table pm_default_roles ( - role_id integer - constraint pm_default_role_fk - references pm_roles - on delete cascade, - party_id integer - constraint pm_default_role_party_fk - references parties(party_id) - on delete cascade, - constraint pm_default_roles_uq - unique (role_id, party_id) -); +create sequence pm_project_role_seq start 3; -comment on table pm_default_roles is ' - Specifies what role a person is a part of by default -'; --- PROJECT ASSIGNMENT - -create table pm_project_assignment ( +create table pm_project_role_map ( project_id integer constraint pm_project_role_map_project_fk references pm_projects on delete cascade, role_id integer constraint pm_project_role_map_role_fk - references pm_roles, + references pm_project_roles, party_id integer constraint pm_project_role_map_user_id_fk references parties(party_id) - on delete cascade, - constraint pm_project_assignment_uq - unique (project_id, role_id, party_id) + on delete cascade ); - -comment on table pm_project_assignment is ' +comment on table pm_project_role_map is ' Maps who is a part of what project, and in what capacity '; --- TASKS +create table pm_project_default_roles ( + role_id integer + constraint pm_proj_default_role_fk + references pm_project_roles + on delete cascade, + party_id integer + constraint pm_proj_default_role_party_fk + references parties(party_id) + on delete cascade +); +comment on table pm_project_role_map is ' + Specifies what role a person is a part of by default, for projects +'; + -- we create two tables to store task information -- the information that we keep revisions on is in the -- pm_task_revisions table, the rest is in pm_task @@ -304,8 +286,6 @@ ); --- DEPENDENCIES - -- dependency types -- such as: -- cannot start until Task X finishes @@ -342,65 +322,78 @@ on delete cascade, dependency_type varchar constraint pm_tasks_const_type - references pm_task_dependency_types, - constraint pm_task_dependency_uq - unique (task_id, parent_task_id) + references pm_task_dependency_types ); --- WORKGROUPS +-- assignments -create sequence pm_workgroup_seq; -create table pm_workgroup ( - workgroup_id integer - constraint pm_workgroup_id_pk +create table pm_task_roles ( + role_id integer + constraint pm_task_role_id_pk primary key, one_line varchar(100) - constraint pm_workgroup_one_line_uq + constraint pm_task_role_one_line_uq unique, description varchar(2000), + is_observer_p char(1) default 'f' + constraint pm_task_role_ck + check (is_observer_p in ('t','f')), sort_order integer ); -create table pm_workgroup_parties ( - workgroup_id integer - constraint pm_workgroup_parties_wg_id_fk - references pm_workgroup(workgroup_id) - on delete cascade, - party_id integer - constraint pm_workgroup_party_fk - references parties(party_id) - on delete cascade, - role_id integer - constraint pm_workgroup_role_id - references pm_roles, - constraint pm_workgroup_parties_uq - unique (workgroup_id, party_id, role_id) -); +comment on table pm_task_roles is ' + Roles represent the way in which a role participates in a task. For example, + they could be an assignee, or a watcher. They can be divided up the same way + the organization is broken up, by sales and R and D for example. These terms + can be made up to fit the conditions of the local company. Defaults are set + up by another table, pm_task_default_role + The is_observer_p specifies + whether they are directly responsible for the task. People not directly + responsible will not get email notifications reminding them that tasks are + overdue, for example. +'; +insert into pm_task_roles (role_id, one_line, description, is_observer_p, sort_order) values ('1','Manager','This person oversees someone responsible for completion of the task','t','10'); +insert into pm_task_roles (role_id, one_line, description, is_observer_p, sort_order) values ('2','Assignee','This person is directly responsible for completion of the task','f','20'); +insert into pm_task_roles (role_id, one_line, description, is_observer_p, sort_order) values ('3','Watcher','This person is interested in developments of a ticket, but not directly responsible for it.','t','30'); --- TASK ASSIGNMENTS -create table pm_task_assignment ( +create sequence pm_task_role_seq start 4; + + +create table pm_task_role_map ( task_id integer - constraint pm_task_assignment_task_fk - references pm_tasks(task_id) + constraint pm_task_role_map_task_fk + references pm_tasks on delete cascade, role_id integer - constraint pm_task_assignment_role_fk - references pm_roles, + constraint pm_task_roles_fk + references pm_task_roles, party_id integer - constraint pm_task_assignment_party_fk + constraint pm_task_role_map_user_id_fk references parties(party_id) - on delete cascade, - constraint pm_task_assignment_uq - unique (task_id, role_id, party_id) + on delete cascade ); +comment on table pm_task_role_map is ' + Maps who is a part of what task, and in what capacity +'; -comment on table pm_project_assignment is ' - Maps who is a part of what project, and in what capacity +create table pm_task_default_roles ( + role_id integer + constraint pm_task_default_role_fk + references pm_task_roles + on delete cascade, + party_id integer + constraint pm_task_default_role_party_fk + references parties(party_id) + on delete cascade +); + +comment on table pm_task_role_map is ' + Specifies what role a person is a part of by default, for tasks '; Index: openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/sql/oracle/Attic/survey-package-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql 19 Sep 2003 16:48:03 -0000 1.1 +++ openacs-4/contrib/packages/survey/sql/oracle/survey-package-create.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -244,7 +244,7 @@ end loop; delete from surveys where survey_id=remove.survey_id; - acs_object.delete(survey_id); + acs_object.del(survey_id); end remove; function name ( @@ -315,7 +315,7 @@ survey_question.remove(v_question_row.question_id); end loop; delete from survey_sections where section_id=remove.section_id; - acs_object.delete(remove.section_id); + acs_object.del(remove.section_id); end remove; end survey_section; / @@ -424,7 +424,7 @@ where question_id=remove.question_id; delete from survey_questions where question_id = remove.question_id; - acs_object.delete(remove.question_id); + acs_object.del(remove.question_id); end remove; end survey_question; / @@ -514,14 +514,14 @@ where response_id=del.response_id and attachment_answer=revision_id) loop - content_item.delete(v_question_response_row.item_id); + content_item.del(v_question_response_row.item_id); end loop; delete from survey_question_responses where response_id=del.response_id; delete from survey_responses where response_id=del.response_id; - acs_object.delete(del.response_id); + acs_object.del(del.response_id); end del; function boolean_answer ( Index: openacs-4/contrib/packages/survey/www/process-response-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/process-response-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/survey/www/process-response-oracle.xql 19 Sep 2003 16:48:03 -0000 1.1 +++ openacs-4/contrib/packages/survey/www/process-response-oracle.xql 30 Sep 2003 12:10:01 -0000 1.2 @@ -36,7 +36,7 @@ begin - content_item.delete(:old_item); + content_item.del(:old_item); end; Index: openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql 4 Apr 2002 15:14:53 -0000 1.5 +++ openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql 30 Sep 2003 12:10:01 -0000 1.6 @@ -43,7 +43,7 @@ - begin membership_rel.deleted( rel_id => :rel_id ); end; + begin membership_rel.del( rel_id => :rel_id ); end; Index: openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 17 May 2003 09:42:01 -0000 1.20 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 30 Sep 2003 12:10:01 -0000 1.21 @@ -882,5 +882,3 @@ end; / show errors - - Index: openacs-4/packages/acs-content-repository/sql/oracle/content-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/oracle/content-drop.sql 27 Sep 2001 22:48:16 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-drop.sql 30 Sep 2003 12:10:01 -0000 1.3 @@ -38,7 +38,7 @@ include_subtypes => 't' ); - content_folder.delete(v_id); + content_folder.del(v_id); -- the root folder for content items @@ -62,7 +62,7 @@ include_subtypes => 't' ); - content_folder.delete (v_id); + content_folder.del (v_id); end; / Index: openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql 17 May 2003 09:42:02 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql 30 Sep 2003 12:10:01 -0000 1.3 @@ -66,17 +66,17 @@ end new; -procedure delete ( +procedure del ( extlink_id in cr_extlinks.extlink_id%TYPE ) is begin delete from cr_extlinks - where extlink_id = content_extlink.delete.extlink_id; + where extlink_id = content_extlink.del.extlink_id; - content_item.delete(content_extlink.delete.extlink_id); + content_item.del(content_extlink.del.extlink_id); -end delete; +end del; function is_extlink ( item_id in cr_items.item_id%TYPE Index: openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 24 Mar 2001 22:00:48 -0000 1.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -84,7 +84,7 @@ end new; -procedure delete ( +procedure del ( folder_id in cr_folders.folder_id%TYPE ) is @@ -104,25 +104,25 @@ end if; content_folder.unregister_content_type( - folder_id => content_folder.delete.folder_id, + folder_id => content_folder.del.folder_id, content_type => 'content_revision', include_subtypes => 't' ); delete from cr_folder_type_map - where folder_id = content_folder.delete.folder_id; + where folder_id = content_folder.del.folder_id; select parent_id into v_parent_id from cr_items - where item_id = content_folder.delete.folder_id; + where item_id = content_folder.del.folder_id; - content_item.delete(folder_id); + content_item.del(folder_id); -- check if any folders are left in the parent update cr_folders set has_child_folders = 'f' where folder_id = v_parent_id and not exists ( select 1 from cr_items where parent_id = v_parent_id and content_type = 'content_folder'); -end delete; +end del; -- renames a folder, making sure the new name is not already in use procedure rename ( @@ -141,15 +141,15 @@ if label is not null and description is not null then update cr_folders - set label = rename.label, - description = rename.description - where folder_id = rename.folder_id; + set label = label, + description = description + where folder_id = folder_id; elsif label is not null and description is null then update cr_folders - set label = rename.label - where folder_id = rename.folder_id; + set label = label + where folder_id = folder_id; end if; Index: openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql 17 May 2003 09:42:02 -0000 1.6 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-image.sql 30 Sep 2003 12:10:01 -0000 1.7 @@ -149,7 +149,7 @@ -- -- Be careful, cannot be undone (easily) --*/ - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ); @@ -307,12 +307,12 @@ is v_content cr_files_to_delete.path%TYPE default null; begin - content_revision.delete ( + content_revision.del ( revision_id => revision_id ); end delete_revision; - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ) is @@ -323,7 +323,7 @@ from cr_revisions where - item_id = image.delete.item_id + item_id = image.del.item_id order by revision_id asc; -- order by used in cursur so latest revision will be deleted last @@ -336,10 +336,10 @@ ); end loop; - content_item.delete ( + content_item.del ( item_id => item_id ); - end delete; + end del; end image; / Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql 17 May 2003 09:42:02 -0000 1.11 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql 30 Sep 2003 12:10:01 -0000 1.12 @@ -464,7 +464,7 @@ 5) delete all permissions associated with this item 6) delete keyword associations 7) delete all associated comments */ -procedure delete ( +procedure del ( item_id in cr_items.item_id%TYPE ) is @@ -482,41 +482,41 @@ from cr_symlinks where - target_id = content_item.delete.item_id; + target_id = content_item.del.item_id; cursor c_revision_cur is select revision_id from cr_revisions where - item_id = content_item.delete.item_id; + item_id = content_item.del.item_id; cursor c_rel_cur is select rel_id from cr_item_rels where - item_id = content_item.delete.item_id + item_id = content_item.del.item_id or - related_object_id = content_item.delete.item_id; + related_object_id = content_item.del.item_id; cursor c_child_cur is select rel_id from cr_child_rels where - child_id = content_item.delete.item_id; + child_id = content_item.del.item_id; cursor c_parent_cur is select rel_id, child_id from cr_child_rels where - parent_id = content_item.delete.item_id; + parent_id = content_item.del.item_id; -- this is strictly for debugging -- cursor c_error_cur is @@ -541,56 +541,56 @@ dbms_output.put_line('Deleting symlinks...'); -- 2) delete all symlinks to this item for v_symlink_val in c_symlink_cur loop - content_symlink.delete(v_symlink_val.symlink_id); + content_symlink.del(v_symlink_val.symlink_id); end loop; dbms_output.put_line('Unscheduling item...'); delete from cr_release_periods - where item_id = content_item.delete.item_id; + where item_id = content_item.del.item_id; dbms_output.put_line('Deleting associated revisions...'); -- 3) delete all revisions of this item delete from cr_item_publish_audit - where item_id = content_item.delete.item_id; + where item_id = content_item.del.item_id; for v_revision_val in c_revision_cur loop - content_revision.delete(v_revision_val.revision_id); + content_revision.del(v_revision_val.revision_id); end loop; dbms_output.put_line('Deleting associated item templates...'); -- 4) unregister all templates to this item delete from cr_item_template_map - where item_id = content_item.delete.item_id; + where item_id = content_item.del.item_id; dbms_output.put_line('Deleting item relationships...'); -- Delete all relations on this item for v_rel_val in c_rel_cur loop - acs_rel.delete(v_rel_val.rel_id); + acs_rel.del(v_rel_val.rel_id); end loop; dbms_output.put_line('Deleting child relationships...'); for v_rel_val in c_child_cur loop - acs_rel.delete(v_rel_val.rel_id); + acs_rel.del(v_rel_val.rel_id); end loop; dbms_output.put_line('Deleting parent relationships...'); for v_rel_val in c_parent_cur loop - acs_rel.delete(v_rel_val.rel_id); - content_item.delete(v_rel_val.child_id); + acs_rel.del(v_rel_val.rel_id); + content_item.del(v_rel_val.child_id); end loop; dbms_output.put_line('Deleting associated permissions...'); -- 5) delete associated permissions delete from acs_permissions - where object_id = content_item.delete.item_id; + where object_id = content_item.del.item_id; dbms_output.put_line('Deleting keyword associations...'); -- 6) delete keyword associations delete from cr_item_keyword_map - where item_id = content_item.delete.item_id; + where item_id = content_item.del.item_id; dbms_output.put_line('Deleting associated comments...'); -- 7) delete associated comments - journal_entry.delete_for_object( content_item.delete.item_id ); + journal_entry.delete_for_object( content_item.del.item_id ); -- context_id debugging loop --for v_error_val in c_error_cur loop @@ -599,9 +599,9 @@ --end loop; dbms_output.put_line('Deleting content item...'); - acs_object.delete(content_item.delete.item_id); + acs_object.del(content_item.del.item_id); -end delete; +end del; procedure rename ( @@ -614,14 +614,14 @@ from cr_items where - name = rename.name + name = name and parent_id = (select parent_id from cr_items where - item_id = rename.item_id); + item_id = item_id); exists_id integer; begin @@ -632,13 +632,13 @@ if exists_cur%NOTFOUND then close exists_cur; update cr_items - set name = rename.name - where item_id = rename.item_id; + set name = name + where item_id = item_id; else close exists_cur; - if exists_id <> rename.item_id then + if exists_id <> item_id then raise_application_error(-20000, - 'An item with the name ' || rename.name || + 'An item with the name ' || name || ' already exists in this directory.'); end if; end if; @@ -1644,7 +1644,7 @@ begin -- delete the relation object - acs_rel.delete( unrelate.rel_id ); + acs_rel.del( unrelate.rel_id ); -- delete the row from the cr_item_rels table delete from cr_item_rels where rel_id = unrelate.rel_id; Index: openacs-4/packages/acs-content-repository/sql/oracle/content-keyword.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-keyword.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/sql/oracle/content-keyword.sql 24 Mar 2001 22:00:48 -0000 1.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-keyword.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -121,26 +121,26 @@ return v_id; end new; -procedure delete ( +procedure del ( keyword_id in cr_keywords.keyword_id%TYPE ) is v_item_id integer; cursor c_rel_cur is select item_id from cr_item_keyword_map - where keyword_id = content_keyword.delete.keyword_id; + where keyword_id = content_keyword.del.keyword_id; begin open c_rel_cur; loop fetch c_rel_cur into v_item_id; exit when c_rel_cur%NOTFOUND; - item_unassign(v_item_id, content_keyword.delete.keyword_id); + item_unassign(v_item_id, content_keyword.del.keyword_id); end loop; close c_rel_cur; - acs_object.delete(keyword_id); -end delete; + acs_object.del(keyword_id); +end del; procedure item_assign ( item_id in cr_items.item_id%TYPE, Index: openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql 28 Aug 2003 09:41:38 -0000 1.6 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql 30 Sep 2003 12:10:01 -0000 1.7 @@ -222,7 +222,7 @@ return v_copy_id; end copy; -procedure delete ( +procedure del ( revision_id in cr_revisions.revision_id%TYPE ) is v_item_id cr_items.item_id%TYPE; @@ -233,7 +233,7 @@ -- Get item id and latest/live revisions select item_id into v_item_id from cr_revisions - where revision_id = content_revision.delete.revision_id; + where revision_id = content_revision.del.revision_id; select latest_revision, live_revision @@ -245,13 +245,13 @@ item_id = v_item_id; -- Recalculate latest revision - if v_latest_revision = content_revision.delete.revision_id then + if v_latest_revision = content_revision.del.revision_id then declare cursor c_revision_cur is select r.revision_id from cr_revisions r, acs_objects o where o.object_id = r.revision_id and r.item_id = v_item_id - and r.revision_id <> content_revision.delete.revision_id + and r.revision_id <> content_revision.del.revision_id order by o.creation_date desc; begin open c_revision_cur; @@ -267,20 +267,20 @@ end if; -- Clear live revision - if v_live_revision = content_revision.delete.revision_id then + if v_live_revision = content_revision.del.revision_id then update cr_items set live_revision = null where item_id = v_item_id; end if; -- Clear the audit delete from cr_item_publish_audit - where old_revision = content_revision.delete.revision_id - or new_revision = content_revision.delete.revision_id; + where old_revision = content_revision.del.revision_id + or new_revision = content_revision.del.revision_id; -- Delete the revision - acs_object.delete(revision_id); + acs_object.del(revision_id); -end delete; +end del; function get_number ( revision_id in cr_revisions.revision_id%TYPE Index: openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql 24 Mar 2001 22:00:48 -0000 1.1 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql 30 Sep 2003 12:10:01 -0000 1.2 @@ -105,16 +105,16 @@ end new; -procedure delete ( +procedure del ( symlink_id in cr_symlinks.symlink_id%TYPE ) is begin delete from cr_symlinks - where symlink_id = content_symlink.delete.symlink_id; + where symlink_id = content_symlink.del.symlink_id; - content_item.delete(content_symlink.delete.symlink_id); -end delete; + content_item.del(content_symlink.del.symlink_id); +end del; Index: openacs-4/packages/acs-content-repository/sql/oracle/content-template.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-template.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/oracle/content-template.sql 7 Jul 2003 12:25:53 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-template.sql 30 Sep 2003 12:10:01 -0000 1.3 @@ -76,23 +76,23 @@ end new; -- delete all template relations -procedure delete ( +procedure del ( template_id in cr_templates.template_id%TYPE ) is begin delete from cr_type_template_map - where template_id = content_template.delete.template_id; + where template_id = content_template.del.template_id; delete from cr_item_template_map - where template_id = content_template.delete.template_id; + where template_id = content_template.del.template_id; delete from cr_templates - where template_id = content_template.delete.template_id; + where template_id = content_template.del.template_id; - content_item.delete(content_template.delete.template_id); + content_item.del(content_template.del.template_id); -end delete; +end del; function is_template ( template_id in cr_templates.template_id%TYPE Index: openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql 28 Aug 2001 23:31:30 -0000 1.3 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-test.sql 30 Sep 2003 12:10:01 -0000 1.4 @@ -295,16 +295,16 @@ -- symlinks/revisions should be deleted automatically /* -content_item.delete(simple_item_id); -content_template.delete(item_template_id); -content_item.delete(item_id); -content_template.delete(type_template_id); -content_template.delete(def_type_template_id); -content_template.delete(dum_template_id); -content_folder.delete(sub_sub_folder_id); -content_folder.delete(sub_folder_id); -content_folder.delete(folder_id); -content_folder.delete(folder_b_id); +content_item.del(simple_item_id); +content_template.del(item_template_id); +content_item.del(item_id); +content_template.del(type_template_id); +content_template.del(def_type_template_id); +content_template.del(dum_template_id); +content_folder.del(sub_sub_folder_id); +content_folder.del(sub_folder_id); +content_folder.del(folder_id); +content_folder.del(folder_b_id); */ end; / Index: openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 28 Aug 2003 09:41:38 -0000 1.10 +++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 30 Sep 2003 12:10:01 -0000 1.11 @@ -420,7 +420,7 @@ relation_tag in cr_child_rels.relation_tag%TYPE default null ) return char; -procedure delete ( +procedure del ( --/** Deletes the specified content item, along with any revisions, symlinks, -- workflows, associated templates, associated keywords, -- child and item relationships for the item. Use with caution - this @@ -873,7 +873,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return cr_revisions.revision_id%TYPE; -procedure delete ( +procedure del ( --/** Deletes the revision. -- @author Karl Goldstein -- @param revision_id The id of the revision to delete @@ -1031,7 +1031,7 @@ ) return cr_symlinks.symlink_id%TYPE; -procedure delete ( +procedure del ( --/** Deletes the symlink -- @author Karl Goldstein -- @param symlink_id The id of the symlink to delete @@ -1129,7 +1129,7 @@ ) return cr_extlinks.extlink_id%TYPE; -procedure delete ( +procedure del ( --/** Deletes the extlink -- @author Karl Goldstein -- @param extlink_id The id of the extlink to delete @@ -1188,7 +1188,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return cr_folders.folder_id%TYPE; -procedure delete ( +procedure del ( --/** Delete a folder. An error is thrown if the folder is not empty -- @author Karl Goldstein -- @param folder_id The id of the folder to delete @@ -1409,7 +1409,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return cr_templates.template_id%TYPE; -procedure delete ( +procedure del ( --/** Deletes the specified template, and unregisters the template from -- all content types and content items. -- Use with caution - this operation cannot be undone. @@ -1481,7 +1481,7 @@ object_type in acs_object_types.object_type%TYPE default 'content_keyword' ) return cr_keywords.keyword_id%TYPE; -procedure delete ( +procedure del ( --/** Deletes the specified keyword, which must be a leaf. Unassigns the -- keyword from all content items. Use with caution - this -- operation cannot be undone. Index: openacs-4/packages/acs-content-repository/tcl/extlink-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/extlink-procs-oracle.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-content-repository/tcl/extlink-procs-oracle.xql 28 Aug 2003 09:41:38 -0000 1.5 +++ openacs-4/packages/acs-content-repository/tcl/extlink-procs-oracle.xql 30 Sep 2003 12:10:01 -0000 1.6 @@ -37,7 +37,7 @@ begin - content_extlink.delete ( + content_extlink.del ( extlink_id => :extlink_id ); end; Index: openacs-4/packages/acs-content-repository/tcl/keyword-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/keyword-procs-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/tcl/keyword-procs-oracle.xql 22 Sep 2003 14:36:13 -0000 1.4 +++ openacs-4/packages/acs-content-repository/tcl/keyword-procs-oracle.xql 30 Sep 2003 12:10:01 -0000 1.5 @@ -23,7 +23,7 @@ begin - content_keyword.delete(:keyword_id); + content_keyword.del(:keyword_id); end; Index: openacs-4/packages/acs-core-docs/www/object-system-design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/object-system-design.html,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-core-docs/www/object-system-design.html 20 Aug 2003 16:20:16 -0000 1.11 +++ openacs-4/packages/acs-core-docs/www/object-system-design.html 30 Sep 2003 12:10:01 -0000 1.12 @@ -580,7 +580,7 @@ build generic procedures for doing large scale queries in the object system, so developers who need to do this will probably have to be fairly familiar with the data model at a lower level.

The function acs_object.new() makes a new object for you. The -function acs_object.delete() deletes an object. As before, this +function acs_object.del() deletes an object. As before, this is an abbreviated interface with all the long type specs removed. See the data model or developer's guide for the full interface.

 
@@ -851,7 +851,7 @@
     delete from membership_rels
     where rel_id = membership_rel.delete.rel_id;
 
-    acs_rel.delete(rel_id);
+    acs_rel.del(rel_id);
   end;
 
 
Index: openacs-4/packages/acs-core-docs/www/objects.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/objects.html,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-core-docs/www/objects.html	20 Aug 2003 16:20:16 -0000	1.12
+++ openacs-4/packages/acs-core-docs/www/objects.html	30 Sep 2003 12:10:01 -0000	1.13
@@ -267,7 +267,7 @@
     delete from notes 
     where note_id = note.delete.note_id; 
  
-    acs_object.delete(note_id); 
+    acs_object.del(note_id); 
   end delete; 
  
 end note; 
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml	20 Aug 2003 16:20:18 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml	30 Sep 2003 12:10:01 -0000	1.7
@@ -370,7 +370,7 @@
     delete from notes 
     where note_id = note.delete.note_id; 
  
-    acs_object.delete(note_id); 
+    acs_object.del(note_id); 
   end delete; 
  
 end note; 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml	20 Aug 2003 16:20:19 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml	30 Sep 2003 12:10:01 -0000	1.6
@@ -1066,7 +1066,7 @@
 with the data model at a lower level.
 
 The function acs_object.new() makes a new object for you. The
-function acs_object.delete() deletes an object. As before, this
+function acs_object.del() deletes an object. As before, this
 is an abbreviated interface with all the long type specs removed. See the
 data model or developer's guide for the full interface.
 
@@ -1443,7 +1443,7 @@
     delete from membership_rels
     where rel_id = membership_rel.delete.rel_id;
 
-    acs_rel.delete(rel_id);
+    acs_rel.del(rel_id);
   end;
 
 
Index: openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql	14 May 2002 05:05:26 -0000	1.4
+++ openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql	30 Sep 2003 12:10:02 -0000	1.5
@@ -368,7 +368,7 @@
         context_id      in acs_objects.context_id%TYPE default null 
     ) return acs_events.event_id%TYPE; 
 
-    procedure delete ( 
+    procedure del ( 
         -- Deletes an event (20.10.40)
         -- Also deletes party mappings (via on delete cascade).
         -- If this is the last instance of a recurring event, the recurrence
@@ -601,24 +601,24 @@
         return new_event_id;
     end new; 
 
-    procedure delete ( 
+    procedure del ( 
         event_id in acs_events.event_id%TYPE 
     )
     is
         recurrence_id acs_events.recurrence_id%TYPE;
     begin
         select recurrence_id into recurrence_id
         from   acs_events
-        where  event_id = acs_event.delete.event_id;
+        where  event_id = acs_event.del.event_id;
 
         -- acs_events and acs_event_party_map deleted via on delete cascade
-        acs_object.delete(event_id); 
+        acs_object.del(event_id); 
 
         -- Check for no more instances and delete recurrence if exists
         if instances_exist_p(recurrence_id) = 'f' then
-            recurrence.delete(recurrence_id);
+            recurrence.del(recurrence_id);
         end if;
-    end delete;
+    end del;
 
     procedure delete_all (
         event_id in acs_events.event_id%TYPE
@@ -646,7 +646,7 @@
     begin
         if recurrence_id is not null then
             for event_id in event_id_cursor loop
-                acs_event.delete(event_id.event_id);
+                acs_event.del(event_id.event_id);
             end loop;
         end if;
     end delete_all_recurrences;
Index: openacs-4/packages/acs-events/sql/oracle/activity-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/activity-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-events/sql/oracle/activity-create.sql	8 Mar 2002 22:30:11 -0000	1.2
+++ openacs-4/packages/acs-events/sql/oracle/activity-create.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -132,7 +132,7 @@
         
     ) return acs_activities.name%TYPE;
  
-    procedure delete ( 
+    procedure del ( 
          -- Deletes an activity
          -- @author W. Scott Meeks
          -- @param activity_id      id of activity to delete
@@ -237,16 +237,16 @@
     end;
 
          
-    procedure delete ( 
+    procedure del ( 
          activity_id in acs_activities.activity_id%TYPE 
     )
     is
     begin
          -- Cascade will cause delete from acs_activities 
          -- and acs_activity_object_map
 
-         acs_object.delete(activity_id); 
-    end delete;
+         acs_object.del(activity_id); 
+    end del;
 
     -- NOTE: can't use update
 
Index: openacs-4/packages/acs-events/sql/oracle/recurrence-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/recurrence-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-events/sql/oracle/recurrence-create.sql	14 May 2002 05:05:26 -0000	1.2
+++ openacs-4/packages/acs-events/sql/oracle/recurrence-create.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -140,7 +140,7 @@
          custom_func            in recurrences.custom_func%TYPE default null
     ) return recurrences.recurrence_id%TYPE;
 
-    procedure delete (
+    procedure del (
          -- Deletes the recurrence
          -- @author W. Scott Meeks
          -- @param recurrence_id id of recurrence to delete
@@ -191,14 +191,14 @@
     end new;
 
     -- Note: this will fail if there are any events_with this recurrence
-    procedure delete (
+    procedure del (
          recurrence_id in recurrences.recurrence_id%TYPE
     )
     is
     begin
         delete from recurrences
-        where  recurrence_id = recurrence.delete.recurrence_id;
-    end delete;
+        where  recurrence_id = recurrence.del.recurrence_id;
+    end del;
 
 end recurrence;
 /
Index: openacs-4/packages/acs-events/sql/oracle/timespan-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/timespan-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-events/sql/oracle/timespan-create.sql	12 Jul 2003 01:10:35 -0000	1.2
+++ openacs-4/packages/acs-events/sql/oracle/timespan-create.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -5,7 +5,7 @@
 -- API:
 --
 --       new        (start_date, end_date)
---       delete     ()
+--       del     ()
 --
 --       edit       (start_date, end_date)
 --
@@ -59,7 +59,7 @@
          end_date       in time_intervals.end_date%TYPE default null
     ) return time_intervals.interval_id%TYPE;
 
-    procedure delete (
+    procedure del (
          -- Deletes the given time interval
          -- @author W. Scott Meeks
          -- @param interval_id  id of the interval to delete
@@ -179,14 +179,14 @@
         return interval_id;
     end new;
 
-    procedure delete (
+    procedure del (
         interval_id in time_intervals.interval_id%TYPE
     )
     is
     begin
         delete time_intervals
-        where  interval_id = time_interval.delete.interval_id;
-    end delete;
+        where  interval_id = time_interval.del.interval_id;
+    end del;
 
     procedure edit (
         interval_id     in time_intervals.interval_id%TYPE,
@@ -389,7 +389,7 @@
 -- 
 --     new          (interval_id)
 --     new          (start_date, end_date)
---     delete       ()
+--     del       ()
 --
 -- Methods to join additional time intervals with an existing timespan:
 --
@@ -427,7 +427,7 @@
         end_date        in time_intervals.end_date%TYPE default null
     ) return timespans.timespan_id%TYPE;
 
-    procedure delete (
+    procedure del (
         -- Deletes the timespan and any contained intervals 
         -- @author W. Scott Meeks
         -- @param timespan_id   id of timespan to delete
@@ -503,7 +503,7 @@
     -- 
     function overlaps_interval_p (
         timespan_id     in timespans.timespan_id%TYPE,
-        interval_id     in time_intervals.interval_id%TYPE
+        interval_id     in time_intervals.interval_id%TYPE default null
     ) return char;
 
     function overlaps_p (
@@ -558,7 +558,7 @@
         return new(time_interval.new(start_date, end_date));
     end new;
 
-    procedure delete (
+    procedure del (
         timespan_id in timespans.timespan_id%TYPE
     )
     is
@@ -568,8 +568,8 @@
         delete from time_intervals
         where  interval_id in (select interval_id
                                from   timespans
-                               where  timespan_id = timespan.delete.timespan_id);
-    end delete;
+                               where  timespan_id = timespan.del.timespan_id);
+    end del;
 
     --
     -- Join a new timespan or time interval to an existing timespan
Index: openacs-4/packages/acs-events/sql/oracle/test/acs-events-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/test/acs-events-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-events/sql/oracle/test/acs-events-test.sql	13 Jul 2001 02:11:04 -0000	1.1
+++ openacs-4/packages/acs-events/sql/oracle/test/acs-events-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -353,9 +353,9 @@
 
 	-- Clean up
 	acs_event.delete_all(event_id);
-	recurrence.delete(recurrence_id);
-	acs_activity.delete(activity_id);
-	timespan.delete(timespan_id);
+	recurrence.del(recurrence_id);
+	acs_activity.del(activity_id);
+	timespan.del(timespan_id);
    END ut_INSERT_INSTANCES;
 
 --     PROCEDURE ut_INSTANCES_EXIST_P IS
Index: openacs-4/packages/acs-events/sql/oracle/test/timespan-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/test/timespan-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-events/sql/oracle/test/timespan-test.sql	13 Jul 2001 02:11:04 -0000	1.1
+++ openacs-4/packages/acs-events/sql/oracle/test/timespan-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -158,7 +158,7 @@
 	    new_interval_id := time_interval.new(date1, date2);
 
 	-- delete the row.
-	time_interval.delete(interval_id => new_interval_id);
+	time_interval.del(interval_id => new_interval_id);
 
  	-- verify time interval not there.
  	utassert.eqtable (
@@ -193,9 +193,9 @@
 		);
 
 		-- Clean up
-		time_interval.delete(interval_1_id);
-		time_interval.delete(interval_2_id);
-		time_interval.delete(interval_3_id);
+		time_interval.del(interval_1_id);
+		time_interval.del(interval_2_id);
+		time_interval.del(interval_3_id);
 	end ut_eq;
 
 	procedure ut_edit
@@ -384,8 +384,8 @@
 		);
 
 		-- Delete the test intervals
-		time_interval.delete(interval_1_id);
-		time_interval.delete(interval_2_id);
+		time_interval.del(interval_1_id);
+		time_interval.del(interval_2_id);
 
 	end ut_overlaps_p;
 
@@ -560,7 +560,7 @@
 		true
 	 );
 
-	 timespan.delete(timespan_copy_id);
+	 timespan.del(timespan_copy_id);
 
 	 timespan_copy_id := timespan.copy(timespan_1_id, 1);
 
@@ -584,9 +584,9 @@
 	 );
 
 	 -- Cleanup
-	 timespan.delete(timespan_1_id);
-	 timespan.delete(timespan_2_id);
-	 timespan.delete(timespan_copy_id);
+	 timespan.del(timespan_1_id);
+	 timespan.del(timespan_2_id);
+	 timespan.del(timespan_copy_id);
    END ut_COPY;
 
    PROCEDURE ut_DELETE IS
@@ -620,7 +620,7 @@
 		't'
 	 );
 
-	 timespan.delete(timespan_id);
+	 timespan.del(timespan_id);
 
       utAssert.eq (
 		'Test of EXISTS_P false',
@@ -704,8 +704,8 @@
 		);
 
 		-- Cleanup
-		timespan.delete(timespan_1_id);
-		timespan.delete(timespan_2_id);
+		timespan.del(timespan_1_id);
+		timespan.del(timespan_2_id);
    END ut_JOIN1;
 
    PROCEDURE ut_JOIN2 IS
@@ -751,8 +751,8 @@
 		);
 
 		-- Cleanup
-		timespan.delete(timespan_1_id);
-		time_interval.delete(interval_1_id);
+		timespan.del(timespan_1_id);
+		time_interval.del(interval_1_id);
    END ut_JOIN2;
 
    PROCEDURE ut_JOIN_INTERVAL IS
@@ -798,8 +798,8 @@
 		);
 
 		-- Cleanup
-		timespan.delete(timespan_1_id);
-		time_interval.delete(interval_3_id);
+		timespan.del(timespan_1_id);
+		time_interval.del(interval_3_id);
    END ut_JOIN_INTERVAL;
 
    PROCEDURE ut_MULTI_INTERVAL_P IS
@@ -830,8 +830,8 @@
 	 );
 
 	 -- Cleanup
-		timespan.delete(timespan_id);
-		time_interval.delete(interval_id);
+		timespan.del(timespan_id);
+		time_interval.del(interval_id);
  END ut_MULTI_INTERVAL_P;
 
    PROCEDURE ut_NEW1 IS
@@ -854,8 +854,8 @@
 	);
 
 	-- Cleanup
-	time_interval.delete(interval_id);
-	timespan.delete(timespan_id);
+	time_interval.del(interval_id);
+	timespan.del(timespan_id);
    END ut_NEW1;
 
    PROCEDURE ut_NEW2 IS
@@ -879,7 +879,7 @@
 		'select to_date(''' || date1 || '''), to_date(''' || date2 || ''') from dual'
 	);
 	-- Cleanup
-	timespan.delete(timespan_id);
+	timespan.del(timespan_id);
    END ut_NEW2;
 
    PROCEDURE ut_OVERLAPS_INTERVAL_P IS
@@ -914,9 +914,9 @@
 	 );
 
 	-- Cleanup
-	timespan.delete(timespan_id);
-	time_interval.delete(interval_1_id);
-	time_interval.delete(interval_2_id);
+	timespan.del(timespan_id);
+	time_interval.del(interval_1_id);
+	time_interval.del(interval_2_id);
    END ut_OVERLAPS_INTERVAL_P;
 
    PROCEDURE ut_OVERLAPS_P1 IS
@@ -951,9 +951,9 @@
 	 );
 
 	-- Cleanup
-	timespan.delete(timespan_1_id);
-	timespan.delete(timespan_2_id);
-	timespan.delete(timespan_3_id);
+	timespan.del(timespan_1_id);
+	timespan.del(timespan_2_id);
+	timespan.del(timespan_3_id);
    END ut_OVERLAPS_P1;
 
    PROCEDURE ut_OVERLAPS_P2 IS
@@ -988,7 +988,7 @@
 	 );
 
 	-- Cleanup
-	timespan.delete(timespan_id);
+	timespan.del(timespan_id);
    END ut_OVERLAPS_P2;
 
 	begin
Index: openacs-4/packages/acs-interface/sql/oracle/acs-interface-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-interface/sql/oracle/acs-interface-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-interface/sql/oracle/acs-interface-create.sql	19 Oct 2001 01:41:41 -0000	1.3
+++ openacs-4/packages/acs-interface/sql/oracle/acs-interface-create.sql	30 Sep 2003 12:10:02 -0000	1.4
@@ -134,10 +134,10 @@
 	creation_ip		in acs_interfaces.creation_ip%TYPE default null
     ) return acs_interfaces.interface_id%TYPE;
 
-    procedure delete (
+    procedure del (
 	interface_id		in acs_interfaces.interface_id%TYPE
     );
-    procedure delete (
+    procedure del (
 	interface_name		in acs_interfaces.interface_name%TYPE,
 	programming_language	in acs_interfaces.programming_language%TYPE
     );
@@ -252,30 +252,30 @@
 	return v_interface_id;
     end new;
 	
-    procedure delete (
+    procedure del (
 	interface_id	    in acs_interfaces.interface_id%TYPE
     ) 
     is 
     begin
 
 	delete from acs_interfaces
-	where interface_id = acs_interface.delete.interface_id;
-    end delete;   
+	where interface_id = acs_interface.del.interface_id;
+    end del;   
 
-    procedure delete (
+    procedure del (
 	interface_name		in acs_interfaces.interface_name%TYPE,
 	programming_language	in acs_interfaces.programming_language%TYPE
     )
     is
 	v_interface_id	    integer;
     begin
 	delete from acs_interfaces
-	where interface_name = acs_interface.delete.interface_name 
-	and   programming_language = acs_interface.delete.programming_language;
+	where interface_name = acs_interface.del.interface_name 
+	and   programming_language = acs_interface.del.programming_language;
 
 	return;
 
-    end delete;	
+    end del;	
 
     procedure assoc_obj_type_with_interface (
 	interface_name		in acs_interfaces.interface_name%TYPE,
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql	28 Aug 2003 09:41:38 -0000	1.8
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql	30 Sep 2003 12:10:02 -0000	1.9
@@ -130,11 +130,11 @@
                     from acs_rels
                     where object_id_two = user_id) loop
 
-            acs_rel.delete(rel_id => row.rel_id);
+            acs_rel.del(rel_id => row.rel_id);
 
         end loop;
 
-        acs_user.delete(user_id => user_id);
+        acs_user.del(user_id => user_id);
     end;
 
     function magic_object_id (
@@ -160,30 +160,38 @@
 
 create or replace view registered_users
 as
-  select p.email, p.url, pe.first_names, pe.last_name, u.*, mr.member_state
-  from parties p, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+  select p.email, p.url, pe.first_names, pe.last_name,
+  u.user_id,u.authority_id,u.username,u.password,u.salt,u.screen_name,u.priv_name,u.priv_email,u.email_verified_p,u.email_bouncing_p,u.no_alerts_until,u.last_visit,u.second_to_last_visit,u.n_sessions,u.password_question,u.password_answer,u.password_changed_date,
+  mr.member_state
+  from parties p, persons pe, users u, group_member_map m, membership_rels mr
   where party_id = person_id
   and person_id = user_id
   and u.user_id = m.member_id
   and m.rel_id = mr.rel_id
-  and amo.name = 'registered_users'
-  and m.group_id = amo.object_id
+  and m.group_id = (select acs.magic_object_id('registered_users') from dual)
   and mr.member_state = 'approved'
   and u.email_verified_p = 't';
 
+
 create or replace view cc_users
 as
-select o.*, pa.*, pe.*, u.*, mr.member_state, mr.rel_id
-from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+select
+o.object_id,o.object_type,o.context_id,o.security_inherit_p,o.creation_user,o.creation_date,o.creation_ip,o.last_modified,o.modifying_user,o.modifying_ip,
+pa.party_id, pa.email, pa.url, 
+pe.person_id, pe.first_names, pe.last_name, 
+u.user_id,u.authority_id,username,u.password,u.salt,u.screen_name,u.priv_name,u.priv_email,u.email_verified_p,u.email_bouncing_p,u.no_alerts_until,u.last_visit,u.second_to_last_visit,u.n_sessions,u.password_question,u.password_answer,password_changed_date,
+mr.member_state, mr.rel_id
+from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects mo
 where o.object_id = pa.party_id
-  and pa.party_id = pe.person_id
-  and pe.person_id = u.user_id
-  and u.user_id = m.member_id
-  and amo.name = 'registered_users'
-  and m.group_id = amo.object_id
-  and m.rel_id = mr.rel_id
-  and m.container_id = m.group_id;
+and pa.party_id = pe.person_id
+and pe.person_id = u.user_id
+and u.user_id = m.member_id
+and m.group_id = mo.object_id
+and mo.name = 'registered_users'
+and m.rel_id = mr.rel_id
+and m.container_id = m.group_id;
 
+
 -----------------------------------
 -- Community Core Initialization --
 -----------------------------------
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	28 Aug 2003 09:41:38 -0000	1.10
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	30 Sep 2003 12:10:02 -0000	1.11
@@ -386,7 +386,7 @@
   context_id    in acs_objects.context_id%TYPE default null
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   object_id	in acs_objects.object_id%TYPE
  );
 
@@ -518,15 +518,15 @@
   return v_object_id;
  end new;
 
- procedure delete (
+ procedure del (
   object_id	in acs_objects.object_id%TYPE
  )
  is
    v_exists_p char;
  begin
   
   -- Delete dynamic/generic attributes
-  delete from acs_attribute_values where object_id = acs_object.delete.object_id;
+  delete from acs_attribute_values where object_id = acs_object.del.object_id;
 
   -- Delete directly assigned permissions
   --
@@ -543,7 +543,7 @@
       from acs_object_types
       start with object_type = (select object_type
                                 from acs_objects o
-                                where o.object_id = acs_object.delete.object_id)
+                                where o.object_id = acs_object.del.object_id)
       connect by object_type = prior supertype)
   loop
     -- Delete from the table if it exists.
@@ -559,7 +559,7 @@
 
   end loop;
 
- end delete;
+ end del;
 
  function name (
   object_id	in acs_objects.object_id%TYPE
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql	13 Feb 2002 16:58:33 -0000	1.3
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-relationships-create.sql	30 Sep 2003 12:10:02 -0000	1.4
@@ -406,7 +406,7 @@
     creation_ip		in acs_objects.creation_ip%TYPE default null
   ) return acs_rels.rel_id%TYPE;
 
-  procedure delete (
+  procedure del (
     rel_id	in acs_rels.rel_id%TYPE
   );
 
@@ -447,12 +447,12 @@
      return v_rel_id;
   end;
 
-  procedure delete (
+  procedure del (
     rel_id	in acs_rels.rel_id%TYPE
   )
   is
   begin
-    acs_object.delete(rel_id);
+    acs_object.del(rel_id);
   end;
 
 end;
Index: openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql	24 Sep 2003 17:25:04 -0000	1.23
+++ openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql	30 Sep 2003 12:10:02 -0000	1.24
@@ -1024,7 +1024,7 @@
 			default null
   ) return apm_packages.package_id%TYPE;
 
-  procedure delete (
+  procedure del (
    package_id		in apm_packages.package_id%TYPE
   );
 
@@ -1078,7 +1078,7 @@
 				        default 'f'
   ) return apm_package_versions.version_id%TYPE;
 
-  procedure delete (
+  procedure del (
       version_id		in apm_packages.package_id%TYPE
   );
 
@@ -1235,7 +1235,7 @@
     attr_value			in apm_parameter_values.attr_value%TYPE
   ) return apm_parameter_values.value_id%TYPE;
 
-  procedure delete (
+  procedure del (
     value_id			in apm_parameter_values.value_id%TYPE default null
   );
  end apm_parameter_value;
@@ -1258,7 +1258,7 @@
     context_id		in acs_objects.context_id%TYPE default null
   ) return acs_objects.object_id%TYPE;
 
-  procedure delete (
+  procedure del (
     application_id		in acs_objects.object_id%TYPE
   );
 
@@ -1282,7 +1282,7 @@
     context_id		in acs_objects.context_id%TYPE default null
   ) return acs_objects.object_id%TYPE;
 
-  procedure delete (
+  procedure del (
     service_id		in acs_objects.object_id%TYPE
   );
 
@@ -1574,7 +1574,7 @@
     where parameter_id = unregister_parameter.parameter_id;
     delete from apm_parameters 
     where parameter_id = unregister_parameter.parameter_id;
-    acs_object.delete(parameter_id);
+    acs_object.del(parameter_id);
   end unregister_parameter;
 
   function id_for_name (
@@ -1781,33 +1781,33 @@
   end if;
 end new;
   
-  procedure delete (
+  procedure del (
    package_id		in apm_packages.package_id%TYPE
   )
   is
     cursor all_values is
     	select value_id from apm_parameter_values
-	where package_id = apm_package.delete.package_id;
+	where package_id = apm_package.del.package_id;
     cursor all_site_nodes is
     	select node_id from site_nodes
-	where object_id = apm_package.delete.package_id;
+	where object_id = apm_package.del.package_id;
   begin
     -- Delete all parameters.
     for cur_val in all_values loop
-    	apm_parameter_value.delete(value_id => cur_val.value_id);
+    	apm_parameter_value.del(value_id => cur_val.value_id);
     end loop;    
-    delete from apm_applications where application_id = apm_package.delete.package_id;
-    delete from apm_services where service_id = apm_package.delete.package_id;
-    delete from apm_packages where package_id = apm_package.delete.package_id;
+    delete from apm_applications where application_id = apm_package.del.package_id;
+    delete from apm_services where service_id = apm_package.del.package_id;
+    delete from apm_packages where package_id = apm_package.del.package_id;
     -- Delete the site nodes for the objects.
     for cur_val in all_site_nodes loop
-    	site_node.delete(cur_val.node_id);
+    	site_node.del(cur_val.node_id);
     end loop;
     -- Delete the object.
-    acs_object.delete (
+    acs_object.del (
 	object_id => package_id
     );
-   end delete;
+   end del;
 
     function initial_install_p (
 	package_key		in apm_packages.package_key%TYPE
@@ -1964,23 +1964,23 @@
       return v_version_id;		
     end new;
 
-    procedure delete (
+    procedure del (
       version_id		in apm_packages.package_id%TYPE
     )
     is
     begin
       delete from apm_package_owners 
-      where version_id = apm_package_version.delete.version_id; 
+      where version_id = apm_package_version.del.version_id; 
 
       delete from apm_package_dependencies
-      where version_id = apm_package_version.delete.version_id;
+      where version_id = apm_package_version.del.version_id;
 
       delete from apm_package_versions 
-	where version_id = apm_package_version.delete.version_id;
+	where version_id = apm_package_version.del.version_id;
 
-      acs_object.delete(apm_package_version.delete.version_id);
+      acs_object.del(apm_package_version.del.version_id);
 
-    end delete;
+    end del;
 
     procedure enable (
        version_id			in apm_package_versions.version_id%TYPE
@@ -2429,7 +2429,7 @@
     if cascade_p = 't' then
         for cur_val in all_package_ids
         loop
-            apm_package.delete(
+            apm_package.del(
 	        package_id => cur_val.package_id
 	    );
         end loop;
@@ -2442,7 +2442,7 @@
         -- Unregister all versions
 	for cur_val in all_versions
 	loop
-	    apm_package_version.delete(version_id => cur_val.version_id);
+	    apm_package_version.del(version_id => cur_val.version_id);
         end loop;
     end if;
     delete from apm_package_types
@@ -2491,15 +2491,15 @@
    return v_value_id;
   end new;
 
-  procedure delete (
+  procedure del (
     value_id			in apm_parameter_values.value_id%TYPE default null
   )
   is
   begin
     delete from apm_parameter_values 
-    where value_id = apm_parameter_value.delete.value_id;
-    acs_object.delete(value_id);
-  end delete;
+    where value_id = apm_parameter_value.del.value_id;
+    acs_object.del(value_id);
+  end del;
 
  end apm_parameter_value;
 /
@@ -2536,16 +2536,16 @@
     return v_application_id;
   end new;
 
-  procedure delete (
+  procedure del (
     application_id		in acs_objects.object_id%TYPE
   )
   is
   begin
     delete from apm_applications
-    where application_id = apm_application.delete.application_id;
-    apm_package.delete(
+    where application_id = apm_application.del.application_id;
+    apm_package.del(
         package_id => application_id);
-  end delete;
+  end del;
 
 end;
 /
@@ -2581,17 +2581,17 @@
     return v_service_id;
   end new;
 
-  procedure delete (
+  procedure del (
     service_id		in acs_objects.object_id%TYPE
   )
   is
   begin
     delete from apm_services
-    where service_id = apm_service.delete.service_id;
-    apm_package.delete(
+    where service_id = apm_service.del.service_id;
+    apm_package.del(
 	package_id => service_id
     );
-  end delete;
+  end del;
 
 end;
 /
Index: openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql	10 Sep 2003 08:40:57 -0000	1.4
+++ openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql	30 Sep 2003 12:10:02 -0000	1.5
@@ -93,7 +93,7 @@
     return integer
     is
     begin
-        acs_object.delete(delete_authority_id);
+        acs_object.del(delete_authority_id);
 
         return 0;
     end del;
Index: openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql	18 Sep 2003 17:11:36 -0000	1.9
+++ openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql	30 Sep 2003 12:10:02 -0000	1.10
@@ -261,7 +261,7 @@
   context_id	in acs_objects.context_id%TYPE default null
  ) return parties.party_id%TYPE;
 
- procedure delete (
+ procedure del (
   party_id	in parties.party_id%TYPE
  );
 
@@ -310,13 +310,13 @@
   return v_party_id;
  end new;
 
- procedure delete (
+ procedure del (
   party_id	in parties.party_id%TYPE
  )
  is
  begin
-  acs_object.delete(party_id);
- end delete;
+  acs_object.del(party_id);
+ end del;
 
  function name (
   party_id	in parties.party_id%TYPE
@@ -392,7 +392,7 @@
   context_id	in acs_objects.context_id%TYPE default null
  ) return persons.person_id%TYPE;
 
- procedure delete (
+ procedure del (
   person_id	in persons.person_id%TYPE
  );
 
@@ -447,16 +447,16 @@
   return v_person_id;
  end new;
 
- procedure delete (
+ procedure del (
   person_id	in persons.person_id%TYPE
  )
  is
  begin
   delete from persons
-  where person_id = person.delete.person_id;
+  where person_id = person.del.person_id;
 
-  party.delete(person_id);
- end delete;
+  party.del(person_id);
+ end del;
 
  function name (
   person_id	in persons.person_id%TYPE
@@ -650,7 +650,7 @@
   user_id	in users.user_id%TYPE
  );
 
- procedure delete (
+ procedure del (
   user_id	in users.user_id%TYPE
  );
 
@@ -753,19 +753,19 @@
     where user_id = unapprove_email.user_id;
  end unapprove_email;
 
- procedure delete (
+ procedure del (
   user_id	in users.user_id%TYPE
  )
  is
  begin
   delete from user_preferences
-  where user_id = acs_user.delete.user_id;
+  where user_id = acs_user.del.user_id;
 
   delete from users
-  where user_id = acs_user.delete.user_id;
+  where user_id = acs_user.del.user_id;
 
-  person.delete(user_id);
- end delete;
+  person.del(user_id);
+ end del;
 
 end acs_user;
 /
Index: openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql	28 Aug 2003 09:41:38 -0000	1.8
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql	30 Sep 2003 12:10:02 -0000	1.9
@@ -88,6 +88,8 @@
 /
 show errors
 
+--alter trigger membership_rels_in_tr disable;
+
 create or replace trigger membership_rels_del_tr
 before delete on membership_rels
 for each row
@@ -217,6 +219,8 @@
 /
 show errors
 
+--alter trigger composition_rels_in_tr disable;
+
 --
 -- TO DO: See if this can be optimized now that the member and component
 -- mapping tables have been combined
@@ -354,12 +358,12 @@
     return v_rel_id;
   end;
 
-  procedure delete (
+  procedure del (
     rel_id      in composition_rels.rel_id%TYPE
   )
   is
   begin
-    acs_rel.delete(rel_id);
+    acs_rel.del(rel_id);
   end;
 
   function check_path_exists_p (
@@ -585,12 +589,12 @@
     where rel_id = deleted.rel_id;
   end;
 
-  procedure delete (
+  procedure del (
     rel_id      in membership_rels.rel_id%TYPE
   )
   is
   begin
-    acs_rel.delete(rel_id);
+    acs_rel.del(rel_id);
   end;
 
   function check_index (
@@ -710,12 +714,12 @@
     return v_rel_id;
   end;
 
-  procedure delete (
+  procedure del (
     rel_id      in admin_rels.rel_id%TYPE
   )
   is
   begin
-    membership_rel.delete(rel_id);
+    membership_rel.del(rel_id);
   end;
 
 end admin_rel;
@@ -785,7 +789,7 @@
  end new;
 
 
- procedure delete (
+ procedure del (
     group_id     in groups.group_id%TYPE
   )
   is
@@ -794,23 +798,23 @@
    -- Delete all segments defined for this group
    for row in (select segment_id 
                  from rel_segments 
-                where group_id = acs_group.delete.group_id) loop
+                where group_id = acs_group.del.group_id) loop
 
-       rel_segment.delete(row.segment_id);
+       rel_segment.del(row.segment_id);
 
    end loop;
 
    -- Delete all the relations of any type to this group
    for row in (select r.rel_id, t.package_name
                  from acs_rels r, acs_object_types t
                 where r.rel_type = t.object_type
-                  and (r.object_id_one = acs_group.delete.group_id
-                       or r.object_id_two = acs_group.delete.group_id)) loop
-      execute immediate 'begin ' ||  row.package_name || '.delete(' || row.rel_id || '); end;';
+                  and (r.object_id_one = acs_group.del.group_id
+                       or r.object_id_two = acs_group.del.group_id)) loop
+      execute immediate 'begin ' ||  row.package_name || '.del(' || row.rel_id || '); end;';
    end loop;
  
-   party.delete(group_id);
- end delete;
+   party.del(group_id);
+ end del;
 
  function name (
   group_id      in groups.group_id%TYPE
Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	28 Aug 2003 09:41:38 -0000	1.6
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	30 Sep 2003 12:10:02 -0000	1.7
@@ -406,7 +406,7 @@
     creation_ip         in acs_objects.creation_ip%TYPE default null
   ) return composition_rels.rel_id%TYPE;
 
-  procedure delete (
+  procedure del (
     rel_id      in composition_rels.rel_id%TYPE
   );
 
@@ -457,7 +457,7 @@
     rel_id      in membership_rels.rel_id%TYPE
   );
 
-  procedure delete (
+  procedure del (
     rel_id      in membership_rels.rel_id%TYPE
   );
 
@@ -483,7 +483,7 @@
     creation_ip         in acs_objects.creation_ip%TYPE default null
   ) return admin_rels.rel_id%TYPE;
 
-  procedure delete (
+  procedure del (
     rel_id      in admin_rels.rel_id%TYPE
   );
 
@@ -510,7 +510,7 @@
   context_id	in acs_objects.context_id%TYPE default null
  ) return groups.group_id%TYPE;
 
- procedure delete (
+ procedure del (
    group_id     in groups.group_id%TYPE
  );
 
Index: openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql	20 Mar 2001 22:51:55 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/journal-create.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -62,7 +62,7 @@
         msg		in journal_entries.msg%TYPE default null
     ) return journal_entries.journal_id%TYPE;
 
-    procedure delete(
+    procedure del (
 	journal_id	in journal_entries.journal_id%TYPE
     );
 
@@ -108,14 +108,14 @@
         return v_journal_id;
     end new;
 
-    procedure delete(
+    procedure del (
 	journal_id	in journal_entries.journal_id%TYPE
     )
     is
     begin
-	delete from journal_entries where journal_id = journal_entry.delete.journal_id;
-	acs_object.delete(journal_entry.delete.journal_id);
-    end delete;
+	delete from journal_entries where journal_id = journal_entry.del.journal_id;
+	acs_object.del(journal_entry.del.journal_id);
+    end del;
 
     procedure delete_for_object(
 	object_id       in acs_objects.object_id%TYPE
@@ -125,7 +125,7 @@
 	    select journal_id from journal_entries where object_id = delete_for_object.object_id;
     begin
         for journal_rec in journal_cur loop
-	    journal_entry.delete(journal_rec.journal_id);
+	    journal_entry.del(journal_rec.journal_id);
 	end loop;
     end delete_for_object;
 
Index: openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-body-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-body-create.sql	20 Mar 2001 22:51:55 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-body-create.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -48,12 +48,12 @@
      return v_constraint_id;
   end;
 
-  procedure delete (
+  procedure del (
     constraint_id	in rel_constraints.constraint_id%TYPE
   )
   is
   begin
-    acs_object.delete(constraint_id);
+    acs_object.del(constraint_id);
   end;
 
   function get_constraint_id (
@@ -74,7 +74,6 @@
 
   end;  
 
-
   function violation (
     rel_id	in acs_rels.rel_id%TYPE
   ) return varchar
@@ -116,6 +115,7 @@
 
   end violation;
 
+
   function violation_if_removed (
     rel_id	in acs_rels.rel_id%TYPE
   ) return varchar
Index: openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql	20 Mar 2001 22:51:55 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/rel-constraints-create.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -96,8 +96,12 @@
 -- where the relation's container_id (i.e., object_id_one) is not in the 
 -- relational segment required_rel_segment.
 
-create or replace view rel_constraints_violated_one as
-select constrained_rels.*
+create or replace view rel_constraints_violated_one as 
+select constrained_rels.constraint_id, constrained_rels.constraint_name,
+   constrained_rels.rel_id, constrained_rels.container_id,
+   constrained_rels.party_id, constrained_rels.rel_type, 
+   constrained_rels.rel_segment,constrained_rels.rel_side, 
+   constrained_rels.required_rel_segment
 from (select rel_constraints.constraint_id, rel_constraints.constraint_name, 
              r.rel_id, r.container_id, r.party_id, r.rel_type, 
              rel_constraints.rel_segment,
@@ -109,10 +113,9 @@
      ) constrained_rels,
      rel_segment_party_map rspm
 where rspm.segment_id(+) = constrained_rels.required_rel_segment
-  and rspm.party_id(+) = constrained_rels.container_id
+  and constrained_rels.container_id is null
   and rspm.party_id is null;
 
-
 -- View rel_constraints_violated_two
 --
 -- pseudo sql:
@@ -123,7 +126,11 @@
 -- relational segment required_rel_segment.
 
 create or replace view rel_constraints_violated_two as
-select constrained_rels.*
+select constrained_rels.constraint_id, constrained_rels.constraint_name,
+   constrained_rels.rel_id, constrained_rels.container_id,
+   constrained_rels.party_id, constrained_rels.rel_type, 
+   constrained_rels.rel_segment,constrained_rels.rel_side, 
+   constrained_rels.required_rel_segment
 from (select rel_constraints.constraint_id, rel_constraints.constraint_name, 
              r.rel_id, r.container_id, r.party_id, r.rel_type, 
              rel_constraints.rel_segment,
@@ -135,7 +142,7 @@
      ) constrained_rels,
      rel_segment_party_map rspm
 where rspm.segment_id(+) = constrained_rels.required_rel_segment
-  and rspm.party_id(+) = constrained_rels.party_id
+  and constrained_rels.party_id is null
   and rspm.party_id is null;
 
 
@@ -439,7 +446,7 @@
     creation_ip		in acs_objects.creation_ip%TYPE default null
   ) return rel_constraints.constraint_id%TYPE;
 
-  procedure delete (
+  procedure del (
     constraint_id	in rel_constraints.constraint_id%TYPE
   );
 
Index: openacs-4/packages/acs-kernel/sql/oracle/rel-segments-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-segments-body-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-kernel/sql/oracle/rel-segments-body-create.sql	21 Mar 2003 14:57:44 -0000	1.4
+++ openacs-4/packages/acs-kernel/sql/oracle/rel-segments-body-create.sql	30 Sep 2003 12:10:02 -0000	1.5
@@ -47,7 +47,7 @@
   return v_segment_id;
  end new;
 
- procedure delete (
+ procedure del (
    segment_id     in rel_segments.segment_id%TYPE
  )
  is
@@ -56,15 +56,15 @@
    -- remove all constraints on this segment
    for row in (select constraint_id 
                  from rel_constraints 
-                where rel_segment = rel_segment.delete.segment_id) loop
+                where rel_segment = rel_segment.del.segment_id) loop
 
-       rel_constraint.delete(row.constraint_id);
+       rel_constraint.del(row.constraint_id);
 
    end loop;
 
-   party.delete(segment_id);
+   party.del(segment_id);
 
- end delete;
+ end del;
 
  -- EXPERIMENTAL / UNSTABLE -- use at your own risk
  --
Index: openacs-4/packages/acs-kernel/sql/oracle/rel-segments-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-segments-create.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-kernel/sql/oracle/rel-segments-create.sql	17 May 2003 01:46:41 -0000	1.6
+++ openacs-4/packages/acs-kernel/sql/oracle/rel-segments-create.sql	30 Sep 2003 12:10:02 -0000	1.7
@@ -108,7 +108,7 @@
   context_id	in acs_objects.context_id%TYPE default null
  ) return rel_segments.segment_id%TYPE;
 
- procedure delete (
+ procedure del (
     --/** Deletes a relational segment
     -- 
     --    @author Oumi Mehrotra (oumi@arsdigita.com)
Index: openacs-4/packages/acs-kernel/sql/oracle/rel-segments-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/rel-segments-drop.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/rel-segments-drop.sql	20 Mar 2001 22:51:55 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/rel-segments-drop.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -8,7 +8,7 @@
 
 begin
     for r in (select segment_id from rel_segments) loop
-	rel_segment.delete(r.segment_id);
+	rel_segment.del(r.segment_id);
     end loop;
 
     acs_object_type.drop_type('rel_segment');
Index: openacs-4/packages/acs-kernel/sql/oracle/site-nodes-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/site-nodes-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/sql/oracle/site-nodes-create.sql	7 Jun 2002 04:17:08 -0000	1.2
+++ openacs-4/packages/acs-kernel/sql/oracle/site-nodes-create.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -68,7 +68,7 @@
 
   -- Delete a site node.
 
-  procedure delete (
+  procedure del (
     node_id             in site_nodes.node_id%TYPE
   );
 
@@ -139,15 +139,15 @@
      return v_node_id;
   end;
 
-  procedure delete (
+  procedure del (
     node_id             in site_nodes.node_id%TYPE
   )
   is
   begin
     delete from site_nodes
-    where node_id = site_node.delete.node_id;
+    where node_id = site_node.del.node_id;
 
-    acs_object.delete(node_id);
+    acs_object.del(node_id);
   end;
 
   function find_pattern (
Index: openacs-4/packages/acs-kernel/sql/oracle/test/acs-objects-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test/acs-objects-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test/acs-objects-test.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test/acs-objects-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -55,7 +55,7 @@
 
     procedure new;
 
-    procedure delete;
+    procedure del;
 
     procedure name;
 
@@ -176,7 +176,7 @@
 	
     end;
 
-    procedure delete
+    procedure del
     is
     begin
         dbms_output.put_line('Testing delete...');
@@ -190,7 +190,7 @@
         );
 
 	-- delete the row.
-	acs_object.delete(object_id => -1001);
+	acs_object.del(object_id => -1001);
 
  	-- verify object not there.
  	utassert.eqtable (
Index: openacs-4/packages/acs-kernel/sql/oracle/test/groups-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test/groups-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test/groups-test.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test/groups-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -92,23 +92,23 @@
   end loop;
 
   -- Remove the test groups.
-  acs_group.delete(G);
-  acs_group.delete(F);
-  acs_group.delete(E);
-  acs_group.delete(D);
-  acs_group.delete(C);
-  acs_group.delete(B);
-  acs_group.delete(A);
+  acs_group.del(G);
+  acs_group.del(F);
+  acs_group.del(E);
+  acs_group.del(D);
+  acs_group.del(C);
+  acs_group.del(B);
+  acs_group.del(A);
 
   -- Remove the test members.
-  acs_user.delete(joe);
-  acs_user.delete(jane);
-  acs_user.delete(bob);
-  acs_user.delete(betty);
-  acs_user.delete(jack);
-  acs_user.delete(jill);
-  acs_user.delete(sven);
-  acs_user.delete(stacy);
+  acs_user.del(joe);
+  acs_user.del(jane);
+  acs_user.del(bob);
+  acs_user.del(betty);
+  acs_user.del(jack);
+  acs_user.del(jill);
+  acs_user.del(sven);
+  acs_user.del(stacy);
 end;
 /
 show errors
Index: openacs-4/packages/acs-kernel/sql/oracle/test/rel-constraints-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test/rel-constraints-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test/rel-constraints-test.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test/rel-constraints-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -269,41 +269,41 @@
 
 
   -- Remove the constraints
-  rel_constraint.delete(side_one_constraint);
-  rel_constraint.delete(side_two_constraint);
+  rel_constraint.del(side_one_constraint);
+  rel_constraint.del(side_two_constraint);
 
   -- Remove the test memebership relations
   for r in (select * from blah_member_rels) loop
-    blah_member_rel.delete(r.rel_id);
+    blah_member_rel.del(r.rel_id);
   end loop;
 
   for r in (select * from yippe_member_rels) loop
-    yippe_member_rel.delete(r.rel_id);
+    yippe_member_rel.del(r.rel_id);
   end loop;
 
   -- Remove the test segments.
-  acs_rel_segment.delete(acs_rel_segment.get(A,'blah_member_rel'));
-  acs_rel_segment.delete(acs_rel_segment.get(E,'composition_rel'));
-  acs_rel_segment.delete(acs_rel_segment.get(reg_users,'yippe_member_rel'));
+  acs_rel_segment.del(acs_rel_segment.get(A,'blah_member_rel'));
+  acs_rel_segment.del(acs_rel_segment.get(E,'composition_rel'));
+  acs_rel_segment.del(acs_rel_segment.get(reg_users,'yippe_member_rel'));
 
   -- Remove the test groups.
-  acs_group.delete(G);
-  acs_group.delete(F);
-  acs_group.delete(E);
-  acs_group.delete(D);
-  acs_group.delete(C);
-  acs_group.delete(B);
-  acs_group.delete(A);
+  acs_group.del(G);
+  acs_group.del(F);
+  acs_group.del(E);
+  acs_group.del(D);
+  acs_group.del(C);
+  acs_group.del(B);
+  acs_group.del(A);
 
   -- Remove the test members.
-  acs_user.delete(joe);
-  acs_user.delete(jane);
-  acs_user.delete(bob);
-  acs_user.delete(betty);
-  acs_user.delete(jack);
-  acs_user.delete(jill);
-  acs_user.delete(sven);
-  acs_user.delete(stacy);
+  acs_user.del(joe);
+  acs_user.del(jane);
+  acs_user.del(bob);
+  acs_user.del(betty);
+  acs_user.del(jack);
+  acs_user.del(jill);
+  acs_user.del(sven);
+  acs_user.del(stacy);
 end;
 /
 show errors
Index: openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test-types-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test-types-create.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test-types-create.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -57,7 +57,7 @@
 	object_id_two	in parties.party_id%TYPE
   ) return blah_member_rels.rel_id%TYPE;
 
-  procedure delete (
+  procedure del (
 	rel_id		in blah_member_rels.rel_id%TYPE
   );
 end blah_member_rel;
@@ -95,15 +95,15 @@
 
   end new;
 
-  procedure delete (
+  procedure del (
 	rel_id		in blah_member_rels.rel_id%TYPE
   )
   is
   begin
 
 	delete from blah_member_rels where rel_id = rel_id;
 
-	membership_rel.delete(rel_id);
+	membership_rel.del(rel_id);
 
   end delete;
 end blah_member_rel;
@@ -123,7 +123,7 @@
 	object_id_two	in parties.party_id%TYPE
   ) return yippe_member_rels.rel_id%TYPE;
 
-  procedure delete (
+  procedure del (
 	rel_id		in yippe_member_rels.rel_id%TYPE
   );
 end yippe_member_rel;
@@ -161,15 +161,15 @@
 
   end new;
 
-  procedure delete (
+  procedure del (
 	rel_id		in yippe_member_rels.rel_id%TYPE
   )
   is
   begin
 
 	delete from yippe_member_rels where rel_id = rel_id;
 
-	membership_rel.delete(rel_id);
+	membership_rel.del(rel_id);
 
   end delete;
 end yippe_member_rel;
Index: openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test/rel-segments-test.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -218,38 +218,38 @@
 
 
   -- Remove the test segments.
-  acs_rel_segment.delete(seg_G_blahs);
-  acs_rel_segment.delete(seg_E_yippes);
-  acs_rel_segment.delete(acs_rel_segment.get(F,'membership_rel'));
+  acs_rel_segment.del(seg_G_blahs);
+  acs_rel_segment.del(seg_E_yippes);
+  acs_rel_segment.del(acs_rel_segment.get(F,'membership_rel'));
 
   -- Remove the test memebership relations
   for r in (select * from blah_member_rels) loop
-    blah_member_rel.delete(r.rel_id);
+    blah_member_rel.del(r.rel_id);
   end loop;
 
   for r in (select * from yippe_member_rels) loop
-    yippe_member_rel.delete(r.rel_id);
+    yippe_member_rel.del(r.rel_id);
   end loop;
 
 
   -- Remove the test groups.
-  acs_group.delete(G);
-  acs_group.delete(F);
-  acs_group.delete(E);
-  acs_group.delete(D);
-  acs_group.delete(C);
-  acs_group.delete(B);
-  acs_group.delete(A);
+  acs_group.del(G);
+  acs_group.del(F);
+  acs_group.del(E);
+  acs_group.del(D);
+  acs_group.del(C);
+  acs_group.del(B);
+  acs_group.del(A);
 
   -- Remove the test members.
-  acs_user.delete(joe);
-  acs_user.delete(jane);
-  acs_user.delete(bob);
-  acs_user.delete(betty);
-  acs_user.delete(jack);
-  acs_user.delete(jill);
-  acs_user.delete(sven);
-  acs_user.delete(stacy);
+  acs_user.del(joe);
+  acs_user.del(jane);
+  acs_user.del(bob);
+  acs_user.del(betty);
+  acs_user.del(jack);
+  acs_user.del(jill);
+  acs_user.del(sven);
+  acs_user.del(stacy);
 end;
 /
 show errors
Index: openacs-4/packages/acs-kernel/sql/oracle/test-harness/acs-core.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/test-harness/acs-core.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/oracle/test-harness/acs-core.sql	20 Mar 2001 22:51:56 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/oracle/test-harness/acs-core.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -25,9 +25,9 @@
 
  dbms_output.put_line('Calling acs_object.name() to get the name of user 1: ' || acs_object.name(1));
 
- dbms_output.put_line('Calling acs_user.delete() to delete user 1');
+ dbms_output.put_line('Calling acs_user.del() to delete user 1');
 
- acs_user.delete(1);
+ acs_user.del(1);
 end;
 /
 show errors
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-drop.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-drop.sql	13 Aug 2001 16:21:32 -0000	1.1
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-drop.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -36,7 +36,7 @@
 begin
     for v_rec in (select object_id from acs_objects where object_type in ('acs_mail_multipart', 'acs_mail_link', 'acs_mail_body','acs_mail_gc_object') order by object_id desc)
     loop
-        acs_object.delete(v_rec.object_id);
+        acs_object.del(v_rec.object_id);
     end loop;
 end;
 /
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql	6 Sep 2001 19:26:27 -0000	1.5
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql	30 Sep 2003 12:10:02 -0000	1.6
@@ -223,7 +223,7 @@
  ) 
  is
  begin
-	acs_mail_queue_message.delete ( message_id );
+	acs_mail_queue_message.del ( message_id );
  end cancel_request;
 
  procedure expand_requests
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-packages-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-packages-create.sql	13 Aug 2001 17:23:52 -0000	1.2
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-packages-create.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -20,7 +20,7 @@
   context_id    in acs_objects.context_id%TYPE    default null
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   gc_object_id in acs_mail_gc_objects.gc_object_id%TYPE
  );
 
@@ -50,7 +50,7 @@
   context_id        in acs_objects.context_id%TYPE    default null
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   body_id in acs_mail_bodies.body_id%TYPE
  );
 
@@ -96,7 +96,7 @@
   context_id     in acs_objects.context_id%TYPE                default null
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   multipart_id in acs_mail_multiparts.multipart_id%TYPE
  );
 
@@ -131,7 +131,7 @@
   object_type     in acs_objects.object_type%TYPE   default 'acs_mail_link'
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   mail_link_id in acs_mail_links.mail_link_id%TYPE
  );
 
@@ -170,15 +170,15 @@
      return v_object_id;
  end new;
 
- procedure delete (
+ procedure del (
   gc_object_id in acs_mail_gc_objects.gc_object_id%TYPE
  )
  is
  begin
      delete from acs_mail_gc_objects
-         where gc_object_id = acs_mail_gc_object.delete.gc_object_id;
-     acs_object.delete(gc_object_id);
- end delete;
+         where gc_object_id = acs_mail_gc_object.del.gc_object_id;
+     acs_object.del(gc_object_id);
+ end del;
 
 end acs_mail_gc_object;
 /
@@ -232,13 +232,13 @@
      return v_object_id;
  end new;
 
- procedure delete (
+ procedure del (
   body_id in acs_mail_bodies.body_id%TYPE
  )
  is
  begin
-     acs_mail_gc_object.delete(body_id);
- end delete;
+     acs_mail_gc_object.del(body_id);
+ end del;
 
  function body_p (
   object_id in acs_objects.object_id%TYPE
@@ -349,13 +349,13 @@
      return v_object_id;
  end new;
 
- procedure delete (
+ procedure del (
   multipart_id in acs_mail_multiparts.multipart_id%TYPE
  )
  is
  begin
-     acs_mail_gc_object.delete(multipart_id);
- end delete;
+     acs_mail_gc_object.del(multipart_id);
+ end del;
 
  function multipart_p (
   object_id in acs_objects.object_id%TYPE
@@ -432,14 +432,14 @@
      return v_object_id;
  end;
 
- procedure delete (
+ procedure del (
   mail_link_id in acs_mail_links.mail_link_id%TYPE
  )
  is
  begin
      delete from acs_mail_links
-         where mail_link_id = acs_mail_link.delete.mail_link_id;
-     acs_object.delete(mail_link_id);
+         where mail_link_id = acs_mail_link.del.mail_link_id;
+     acs_object.del(mail_link_id);
  end;
 
  function link_p (
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql	17 May 2003 09:51:08 -0000	1.6
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql	30 Sep 2003 12:10:02 -0000	1.7
@@ -62,7 +62,7 @@
   object_type     in acs_objects.object_type%TYPE   default 'acs_mail_link'
  ) return acs_objects.object_id%TYPE;
 
- procedure delete (
+ procedure del (
   message_id in acs_mail_links.mail_link_id%TYPE
  );
 end acs_mail_queue_message;
@@ -99,14 +99,14 @@
      return v_object_id;
  end;
 
- procedure delete (
+ procedure del (
   message_id in acs_mail_links.mail_link_id%TYPE
  )
  is
  begin
      delete from acs_mail_queue_messages
-         where message_id = acs_mail_queue_message.delete.message_id;
-     acs_mail_link.delete(message_id);
+         where message_id = acs_mail_queue_message.del.message_id;
+     acs_mail_link.del(message_id);
  end;
 
 end acs_mail_queue_message;
Index: openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-packages.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-packages.sql	12 May 2002 20:57:02 -0000	1.3
+++ openacs-4/packages/acs-messaging/sql/oracle/acs-messaging-packages.sql	30 Sep 2003 12:10:02 -0000	1.4
@@ -43,7 +43,7 @@
         is_live       in char                           default 't'
     ) return acs_objects.object_id%TYPE;
 
-    procedure delete (
+    procedure del (
         message_id    in acs_messages.message_id%TYPE
     );
 
@@ -301,15 +301,15 @@
 
     end edit;   
 
-    procedure delete (
+    procedure del (
         message_id    in acs_messages.message_id%TYPE
     )
     is
     begin
         delete from acs_messages
-            where message_id = acs_message.delete.message_id;
-        content_item.delete(message_id);
-    end delete;
+            where message_id = acs_message.del.message_id;
+        content_item.del(message_id);
+    end del;
 
     function message_p (
         message_id    in acs_messages.message_id%TYPE
@@ -465,7 +465,7 @@
     ) 
     is
     begin
-        content_item.delete(delete_file.file_id);       
+        content_item.del(delete_file.file_id);       
     end delete_file;    
 
     function new_image (
@@ -567,7 +567,7 @@
         -- XXX fix after image.delete exists
         delete from images
             where image_id = delete_image.image_id;
-        content_item.delete(image_id);
+        content_item.del(image_id);
     end delete_image;
 
     -- XXX should just call content_extlink.new
@@ -623,7 +623,7 @@
         extlink_id  in cr_extlinks.extlink_id%TYPE
     ) is
     begin
-        content_extlink.delete(extlink_id => delete_extlink.extlink_id);
+        content_extlink.del(extlink_id => delete_extlink.extlink_id);
     end delete_extlink;
 
     function name (
Index: openacs-4/packages/acs-reference/sql/oracle/acs-reference-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/sql/oracle/acs-reference-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-reference/sql/oracle/acs-reference-create.sql	27 Aug 2001 02:49:48 -0000	1.3
+++ openacs-4/packages/acs-reference/sql/oracle/acs-reference-create.sql	30 Sep 2003 12:10:02 -0000	1.4
@@ -92,7 +92,7 @@
         last_name       in persons.last_name%TYPE default null
     ) return acs_objects.object_id%TYPE;
 
-    procedure delete (
+    procedure del (
         repository_id in acs_reference_repositories.repository_id%TYPE
     );
 
@@ -174,23 +174,23 @@
         return v_repository_id;    
     end new;
 
-    procedure delete (
+    procedure del (
         repository_id in acs_reference_repositories.repository_id%TYPE
     )
     is
 	v_maintainer_id integer;
     begin
 	select maintainer_id into v_maintainer_id
 	from   acs_reference_repositories
-	where  repository_id = acs_reference.delete.repository_id;
+	where  repository_id = acs_reference.del.repository_id;
 
         delete from acs_reference_repositories
-        where  repository_id = acs_reference.delete.repository_id;
+        where  repository_id = acs_reference.del.repository_id;
 
-        acs_object.delete(repository_id);
-	person.delete(v_maintainer_id);
+        acs_object.del(repository_id);
+	person.del(v_maintainer_id);
 
-    end delete;
+    end del;
 
     function is_expired_p (
 	repository_id integer
Index: openacs-4/packages/acs-reference/sql/oracle/acs-reference-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/sql/oracle/acs-reference-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-reference/sql/oracle/acs-reference-drop.sql	27 Aug 2001 02:45:45 -0000	1.2
+++ openacs-4/packages/acs-reference/sql/oracle/acs-reference-drop.sql	30 Sep 2003 12:10:02 -0000	1.3
@@ -22,7 +22,7 @@
 	 if rec.package_name is not null then
 	     execute immediate 'drop package ' || rec.package_name;
          end if;
-         acs_reference.delete(rec.repository_id);
+         acs_reference.del(rec.repository_id);
     end loop;
 end;
 /
Index: openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-msg-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-msg-types-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-msg-types-create.sql	26 Jun 2002 19:52:41 -0000	1.3
+++ openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-msg-types-create.sql	30 Sep 2003 12:10:02 -0000	1.4
@@ -50,7 +50,7 @@
 	msg_type_spec	 in varchar2
      ) return acs_sc_msg_types.msg_type_id%TYPE;
 
-    procedure delete (
+    procedure del (
         msg_type_id	 in acs_sc_msg_types.msg_type_id%TYPE default null,
 	msg_type_name	 in acs_sc_msg_types.msg_type_name%TYPE default null
     );
@@ -114,7 +114,7 @@
 
      end new;
 
-     procedure delete (
+     procedure del (
          msg_type_id	 in acs_sc_msg_types.msg_type_id%TYPE default null,
 	 msg_type_name	 in acs_sc_msg_types.msg_type_name%TYPE default null
      )
@@ -138,7 +138,7 @@
 	delete from acs_sc_msg_types 
 	       where msg_type_id = v_msg_type_id;
 
-     end delete;
+     end del;
 
     function get_id (
         msg_type_name in acs_sc_msg_types.msg_type_name%TYPE
Index: openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-packages-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-packages-create.sql	11 Sep 2003 08:58:22 -0000	1.11
+++ openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-packages-create.sql	30 Sep 2003 12:10:02 -0000	1.12
@@ -16,7 +16,7 @@
        contract_id	in acs_sc_contracts.contract_id%TYPE
    ) return acs_sc_contracts.contract_name%TYPE;
 
-   procedure delete (
+   procedure del (
        contract_name	in acs_sc_contracts.contract_name%TYPE default null,
        contract_id	in acs_sc_contracts.contract_id%TYPE default null
    );
@@ -43,7 +43,7 @@
    ) return acs_sc_operations.operation_id%TYPE;
 
 
-   procedure delete (
+   procedure del (
        operation_id		acs_sc_operations.operation_id%TYPE default null,
        operation_name		acs_sc_operations.operation_name%TYPE default null,
        contract_name		acs_sc_contracts.contract_name%TYPE default null
@@ -72,7 +72,7 @@
        impl_id			acs_sc_impls.impl_id%TYPE
    ) return acs_sc_impls.impl_name%TYPE;
 
-   procedure delete (
+   procedure del (
        impl_contract_name	acs_sc_impls.impl_contract_name%TYPE,
        impl_name		acs_sc_impls.impl_name%TYPE
    );
@@ -108,7 +108,7 @@
        impl_pl			acs_sc_impl_aliases.impl_pl%TYPE
    ) return acs_sc_impl_aliases.impl_id%TYPE;
 
-   function delete (
+   function del (
        impl_contract_name	acs_sc_contracts.contract_name%TYPE,
        impl_name		acs_sc_impls.impl_name%TYPE,
        impl_operation_name	acs_sc_operations.operation_name%TYPE
@@ -127,7 +127,7 @@
        impl_name	acs_sc_impls.impl_name%TYPE default null
    );
 
-   procedure delete(
+   procedure del (
        contract_id	acs_sc_contracts.contract_id%TYPE default null,
        contract_name	acs_sc_contracts.contract_name%TYPE default null,
        impl_id		acs_sc_impls.impl_id%TYPE default null,
@@ -198,7 +198,7 @@
 
    end get_name;
 
-   procedure delete (
+   procedure del (
        contract_name	in acs_sc_contracts.contract_name%TYPE default null,
        contract_id	in acs_sc_contracts.contract_id%TYPE default null
    )
@@ -221,9 +221,9 @@
 
        delete from acs_sc_contracts
               where contract_id = v_contract_id;
-       acs_object.delete(v_contract_id);
+       acs_object.del(v_contract_id);
 
-   end delete;
+   end del;
 
 end acs_sc_contract;
 /
@@ -297,7 +297,7 @@
    end get_id;
 
 
-   procedure delete (
+   procedure del (
        operation_id		acs_sc_operations.operation_id%TYPE default null,
        operation_name		acs_sc_operations.operation_name%TYPE default null,
        contract_name		acs_sc_contracts.contract_name%TYPE default null
@@ -321,7 +321,7 @@
        delete from acs_sc_operations
 	   where operation_id = v_operation_id;
 
-   end delete;
+   end del;
 
    	   	
 end acs_sc_operation;
@@ -393,16 +393,16 @@
 
    end get_name;
 
-   procedure delete (
+   procedure del (
        impl_contract_name	acs_sc_impls.impl_contract_name%TYPE,
        impl_name		acs_sc_impls.impl_name%TYPE
    )
    as
    begin
        delete from acs_sc_impls
-       where impl_contract_name = acs_sc_impl.delete.impl_contract_name
-       and impl_name = acs_sc_impl.delete.impl_name;   	
-   end delete;
+       where impl_contract_name = acs_sc_impl.del.impl_contract_name
+       and impl_name = acs_sc_impl.del.impl_name;   	
+   end del;
 
 
    /* next 2 functions are deprecated. */
@@ -443,7 +443,7 @@
 	-- FUNCTION DEPRECATED. USE acs_sc_impl_alias.delete
 	dbms_output.put_line('acs_sc_impl.delete_alias DEPRECATED. Use acs_sc_impl_alias.delete');
 
-	v_impl_id := acs_sc_impl_alias.delete(
+	v_impl_id := acs_sc_impl_alias.del(
 		impl_contract_name,
 		impl_name,
 		impl_operation_name
@@ -493,7 +493,7 @@
 
    end new;
 
-   function delete (
+   function del (
        impl_contract_name	acs_sc_contracts.contract_name%TYPE,
        impl_name			acs_sc_impls.impl_name%TYPE,
        impl_operation_name	acs_sc_operations.operation_name%TYPE
@@ -504,13 +504,13 @@
        v_impl_id := acs_sc_impl.get_id(impl_contract_name,impl_name);
 
        delete from acs_sc_impl_aliases
-       where impl_contract_name = acs_sc_impl_alias.delete.impl_contract_name
-       and impl_name = acs_sc_impl_alias.delete.impl_name
-       and impl_operation_name = acs_sc_impl_alias.delete.impl_operation_name;
+       where impl_contract_name = acs_sc_impl_alias.del.impl_contract_name
+       and impl_name = acs_sc_impl_alias.del.impl_name
+       and impl_operation_name = acs_sc_impl_alias.del.impl_operation_name;
 
        return v_impl_id;
 
-   end delete;
+   end del;
 
 end acs_sc_impl_alias;
 /
@@ -580,7 +580,7 @@
 
    end new;
 
-   procedure delete(
+   procedure del (
        contract_id	acs_sc_contracts.contract_id%TYPE default null,
        contract_name	acs_sc_contracts.contract_name%TYPE default null,
        impl_id		acs_sc_impls.impl_id%TYPE default null,
@@ -607,7 +607,7 @@
        delete from acs_sc_bindings
            where  contract_id = v_contract_id
 	   and impl_id = v_impl_id;
-   end delete;
+   end del;
 
    function exists_p (
        contract_name        acs_sc_contracts.contract_name%TYPE,
Index: openacs-4/packages/acs-service-contract/sql/oracle/sc-sample-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/sc-sample-drop.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-service-contract/sql/oracle/sc-sample-drop.sql	19 Sep 2001 22:59:01 -0000	1.1
+++ openacs-4/packages/acs-service-contract/sql/oracle/sc-sample-drop.sql	30 Sep 2003 12:10:02 -0000	1.2
@@ -1,21 +1,21 @@
 begin
 
-   acs_sc_impl.delete(
+   acs_sc_impl.del(
            'ObjectDisplay',			-- impl_contract_name
 	   'bboard_message'			-- impl_name
    );
 
-   acs_sc_contract.delete(contract_name=>'ObjectDisplay',
+   acs_sc_contract.del(contract_name=>'ObjectDisplay',
 			  operation_name=>'name');
 
-   acs_sc_msg_type.delete ('ObjectDisplay.Name.InputType');
-   acs_sc_msg_type.delete ('ObjectDisplay.Name.OutputType');
+   acs_sc_msg_type.del ('ObjectDisplay.Name.InputType');
+   acs_sc_msg_type.del ('ObjectDisplay.Name.OutputType');
 
-   acs_sc_msg_type.delete ('ObjectDisplay.Url.InputType');
-   acs_sc_msg_type.delete ('ObjectDisplay.Url.OutputType');
+   acs_sc_msg_type.del ('ObjectDisplay.Url.InputType');
+   acs_sc_msg_type.del ('ObjectDisplay.Url.OutputType');
 
-   acs_sc_msg_type.delete ('ObjectDisplay.SampleHello.InputType');
-   acs_sc_msg_type.delete ('ObjectDisplay.SampleHello.OutputType');
+   acs_sc_msg_type.del ('ObjectDisplay.SampleHello.InputType');
+   acs_sc_msg_type.del ('ObjectDisplay.SampleHello.OutputType');
 
 
 
Index: openacs-4/packages/acs-service-contract/tcl/contract-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/contract-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-service-contract/tcl/contract-procs-oracle.xql	25 Feb 2003 15:15:33 -0000	1.2
+++ openacs-4/packages/acs-service-contract/tcl/contract-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.3
@@ -43,7 +43,7 @@
   
     
       begin
-        acs_sc_contract.delete(
+        acs_sc_contract.del(
             contract_name => :name
         );
       end;
@@ -78,7 +78,7 @@
   
     
         begin
-          acs_sc_operation.delete(
+          acs_sc_operation.del(
             contract_name => :contract_name, 
             operation_name => :operation_name
           );
Index: openacs-4/packages/acs-service-contract/tcl/implementation-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/implementation-procs-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/tcl/implementation-procs-oracle.xql	10 Sep 2003 14:52:01 -0000	1.3
+++ openacs-4/packages/acs-service-contract/tcl/implementation-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.4
@@ -44,7 +44,7 @@
     
         
             begin
-                acs_sc_impl.delete(
+                acs_sc_impl.del(
                        impl_contract_name => :contract_name, 
                        impl_name => :impl_name
                    );
Index: openacs-4/packages/acs-service-contract/tcl/msg-type-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/msg-type-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-service-contract/tcl/msg-type-procs-oracle.xql	25 Feb 2003 15:15:33 -0000	1.2
+++ openacs-4/packages/acs-service-contract/tcl/msg-type-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.3
@@ -17,7 +17,7 @@
   
     
         begin
-            acs_sc_msg_type.delete(
+            acs_sc_msg_type.del(
                 msg_type_id => :msg_type_id
             );
         end;
@@ -27,7 +27,7 @@
   
     
         begin
-            acs_sc_msg_type.delete(
+            acs_sc_msg_type.del(
                 msg_type_name => :name
             );
         end;
Index: openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql	31 Jan 2002 03:04:32 -0000	1.1
+++ openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql	30 Sep 2003 12:10:03 -0000	1.2
@@ -6,7 +6,7 @@
       
       
          begin
-           select acs_sc_binding.delete(:contract_id,:impl_id)
+           select acs_sc_binding.del(:contract_id,:impl_id)
          end;
       
 
Index: openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql	28 Aug 2003 09:41:39 -0000	1.2
+++ openacs-4/packages/acs-subsite/sql/oracle/application-groups-create.sql	30 Sep 2003 12:10:03 -0000	1.3
@@ -57,7 +57,7 @@
   context_id	in acs_objects.context_id%TYPE default null
  ) return application_groups.group_id%TYPE;
 
- procedure delete (
+ procedure del (
    group_id     in application_groups.group_id%TYPE
  );
 
@@ -112,15 +112,15 @@
  end new;
 
 
- procedure delete (
+ procedure del (
     group_id     in application_groups.group_id%TYPE
  )
  is
  begin
 
-   acs_group.delete(group_id); 
+   acs_group.del(group_id); 
 
- end delete;
+ end del;
 
  function group_id_from_package_id (
    package_id    in application_groups.group_id%TYPE,
Index: openacs-4/packages/acs-subsite/sql/oracle/subsite-callbacks-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/subsite-callbacks-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/subsite-callbacks-create.sql	5 Apr 2001 18:23:38 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/subsite-callbacks-create.sql	30 Sep 2003 12:10:03 -0000	1.2
@@ -98,7 +98,7 @@
        sort_order          IN subsite_callbacks.sort_order%TYPE default null
   ) return subsite_callbacks.callback_id%TYPE;
 
-  procedure delete (
+  procedure del (
   --/** Deletes the specified callback
   -- 
   --    @author Michael Bryzek (mbryzek@arsdigita.com)
@@ -164,13 +164,13 @@
   END new;
 
 
-  procedure delete (
+  procedure del (
        callback_id         IN subsite_callbacks.callback_id%TYPE
   )
   is
   begin
-     delete from subsite_callbacks where callback_id=subsite_callback.delete.callback_id;
-  end delete;
+     delete from subsite_callbacks where callback_id=subsite_callback.del.callback_id;
+  end del;
 
 end subsite_callback;
 /
Index: openacs-4/packages/acs-subsite/sql/oracle/user-profiles-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/user-profiles-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/user-profiles-create.sql	5 Apr 2001 18:23:38 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/user-profiles-create.sql	30 Sep 2003 12:10:03 -0000	1.2
@@ -64,7 +64,7 @@
     creation_ip         in acs_objects.creation_ip%TYPE default null
   ) return user_profiles.profile_id%TYPE;
 
-  procedure delete (
+  procedure del (
     profile_id      in user_profiles.profile_id%TYPE
   );
 
@@ -104,13 +104,13 @@
     return v_profile_id;
   end new;
 
-  procedure delete (
+  procedure del (
     profile_id      in user_profiles.profile_id%TYPE
   )
   is
   begin
 
-    membership_rel.delete(profile_id);
+    membership_rel.del(profile_id);
 
   end delete;
 
Index: openacs-4/packages/acs-subsite/sql/oracle/tests/subsite-callbacks-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/tests/subsite-callbacks-test.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/tests/subsite-callbacks-test.sql	5 Apr 2001 18:23:38 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/tests/subsite-callbacks-test.sql	30 Sep 2003 12:10:03 -0000	1.2
@@ -41,7 +41,7 @@
      raise_application_error(-20000,'Duplicate insert succeeded where it should have done nothing.');
   end if;
 
-  subsite_callback.delete(v_callback_id);
+  subsite_callback.del(v_callback_id);
 
   v_callback_id := subsite_callback.new(object_type=>'group',
                                         event_type=>'insert',
@@ -58,7 +58,7 @@
      raise_application_error(-20000,'Insert failed');
   end if;
 
-  subsite_callback.delete(v_callback_id);
+  subsite_callback.del(v_callback_id);
 
   select count(*) into v_count
     from subsite_callbacks
Index: openacs-4/packages/acs-subsite/tcl/application-group-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/application-group-procs-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/tcl/application-group-procs-oracle.xql	17 May 2003 09:58:37 -0000	1.3
+++ openacs-4/packages/acs-subsite/tcl/application-group-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.4
@@ -111,7 +111,7 @@
       
       
 		begin
-		:1 := application_group.delete (
+		:1 := application_group.del (
 	                group_id      => :group_id,
 		);
 		end;
Index: openacs-4/packages/acs-subsite/tcl/group-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs-oracle.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/tcl/group-procs-oracle.xql	28 Aug 2003 09:41:39 -0000	1.4
+++ openacs-4/packages/acs-subsite/tcl/group-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.5
@@ -16,12 +16,12 @@
                          where segs.segment_id = cons.required_rel_segment
                            and segs.group_id = :group_id) loop
 
-                rel_segment.delete(row.constraint_id);
+                rel_segment.del(row.constraint_id);
 
             end loop;
 
 	    -- delete the actual group
-	    ${package_name}.delete(:group_id); 
+	    ${package_name}.del(:group_id); 
 	  END;
         
       
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	21 Sep 2003 19:31:35 -0000	1.6
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	30 Sep 2003 12:10:03 -0000	1.7
@@ -159,12 +159,12 @@
                          where segs.segment_id = cons.required_rel_segment
                            and segs.group_id = :group_id) loop
 
-                rel_segment.delete(row.constraint_id);
+                rel_segment.del(row.constraint_id);
 
             end loop;
 
 	    -- delete the actual group
-	    ${package_name}.delete(:group_id); 
+	    ${package_name}.del(:group_id); 
 	  END;
         "
 
Index: openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql	4 Feb 2002 18:52:12 -0000	1.5
+++ openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.6
@@ -199,15 +199,15 @@
 
   end new;
 
-  procedure delete (
+  procedure del (
     $id_column      in ${table_name}.${id_column}%TYPE
   )
   is 
   begin
 
-    ${supertype_package_name}.delete( $package_name.delete.$id_column );
+    ${supertype_package_name}.del( $package_name.del.$id_column );
 
-  end delete;
+  end del;
 
 end ${package_name};
     
@@ -229,7 +229,7 @@
 		 $object_type]]
  ) return ${table_name}.${id_column}%TYPE;
 
-  procedure delete (
+  procedure del (
     $id_column      in ${table_name}.${id_column}%TYPE
   );
 END ${package_name};
Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql	17 May 2003 09:58:37 -0000	1.2
+++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.3
@@ -24,7 +24,7 @@
       
       
       
-	    begin rel_constraint.delete(:constraint_id); end;
+	    begin rel_constraint.del(:constraint_id); end;
 	
       
 
@@ -33,7 +33,7 @@
       
       
       
-	begin rel_segment.delete(:segment_id); end;
+	begin rel_segment.del(:segment_id); end;
     
       
 
Index: openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl	17 May 2003 09:58:37 -0000	1.2
+++ openacs-4/packages/acs-subsite/tcl/rel-segments-procs.tcl	30 Sep 2003 12:10:03 -0000	1.3
@@ -66,12 +66,12 @@
 	 where c.required_rel_segment = :segment_id
     } {
 	db_exec_plsql constraint_delete {
-	    begin rel_constraint.delete(:constraint_id); end;
+	    begin rel_constraint.del(:constraint_id); end;
 	}
     }
 
     db_exec_plsql rel_segment_delete {
-	begin rel_segment.delete(:segment_id); end;
+	begin rel_segment.del(:segment_id); end;
     }
     
 }
Index: openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql	15 May 2001 16:59:00 -0000	1.2
+++ openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql	30 Sep 2003 12:10:03 -0000	1.3
@@ -28,7 +28,7 @@
  
       
       
-      begin ${package_name}.delete(:rel_id); end;
+      begin ${package_name}.del(:rel_id); end;
       
 
 
Index: openacs-4/packages/acs-subsite/tcl/relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	21 Sep 2003 19:31:18 -0000	1.7
+++ openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	30 Sep 2003 12:10:03 -0000	1.8
@@ -145,7 +145,7 @@
 	}
     }
 
-    db_exec_plsql relation_delete "begin ${package_name}.delete(:rel_id); end;"
+    db_exec_plsql relation_delete "begin ${package_name}.del(:rel_id); end;"
 
     return 1
 }
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2-oracle.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2-oracle.xql	30 Sep 2003 12:10:03 -0000	1.2
@@ -6,7 +6,7 @@
       
       
       
-	begin rel_constraint.delete(constraint_id => :constraint_id); end;
+	begin rel_constraint.del(constraint_id => :constraint_id); end;
     
       
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	18 Sep 2002 12:16:42 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	30 Sep 2003 12:10:03 -0000	1.3
@@ -45,7 +45,7 @@
     }
     
     db_exec_plsql delete_constraint {
-	begin rel_constraint.delete(constraint_id => :constraint_id); end;
+	begin rel_constraint.del(constraint_id => :constraint_id); end;
     }
     db_release_unused_handles
 
Index: openacs-4/packages/acs-subsite/www/doc/group-admin-pages-acceptance-test.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/doc/group-admin-pages-acceptance-test.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/doc/group-admin-pages-acceptance-test.html	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/doc/group-admin-pages-acceptance-test.html	30 Sep 2003 12:10:03 -0000	1.3
@@ -89,7 +89,7 @@
   is
   begin
 
-    acs_group.delete( developer_defined_test_type.delete.TEST_GROUP_ID );
+    acs_group.del( developer_defined_test_type.delete.TEST_GROUP_ID );
 
   end delete;
 
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/unsubscribe-2-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2-oracle.xql	1 May 2001 19:00:18 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2-oracle.xql	30 Sep 2003 12:10:03 -0000	1.2
@@ -17,7 +17,7 @@
       
       
 begin
-  membership_rel.deleted( rel_id => :rel_id );
+  membership_rel.del( rel_id => :rel_id );
 end;
       
 
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	10 Sep 2003 12:30:07 -0000	1.37
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	30 Sep 2003 12:10:03 -0000	1.38
@@ -535,7 +535,7 @@
     
     # Oracle:
     db_exec_plsql delete_note {
-        begin  note.delete(:note_id);  end;
+        begin  note.del(:note_id);  end;
     }
 
     # PostgreSQL:
@@ -587,9 +587,9 @@
     # Oracle:
     db_exec_plsql delete_note {
         begin
-        note.delete(:note_id);
-        note.delete(:another_note_id);
-        note.delete(:yet_another_note_id);
+        note.del(:note_id);
+        note.del(:another_note_id);
+        note.del(:yet_another_note_id);
         end;
     }
 
@@ -619,7 +619,7 @@
     <fullquery name="delete_note">      
       <querytext>
         begin
-        note.delete(:note_id);
+        note.del(:note_id);
         end;
       </querytext>
     </fullquery>
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 17 May 2003 10:04:18 -0000 1.8 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 30 Sep 2003 12:10:03 -0000 1.9 @@ -70,7 +70,7 @@ begin - apm_package_version.delete(version_id => :version_id); + apm_package_version.del(version_id => :version_id); end; Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.54 -r1.55 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 25 Sep 2003 13:07:01 -0000 1.54 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 30 Sep 2003 12:10:03 -0000 1.55 @@ -716,7 +716,7 @@ } { db_exec_plsql apm_version_delete { begin - apm_package_version.delete(version_id => :version_id); + apm_package_version.del(version_id => :version_id); end; } } Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 1 May 2003 20:40:53 -0000 1.9 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 30 Sep 2003 12:10:03 -0000 1.10 @@ -160,7 +160,7 @@ begin - apm_package.delete( + apm_package.del( package_id => :package_id ); end; Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -N -r1.55 -r1.56 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 24 Sep 2003 18:22:16 -0000 1.55 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 30 Sep 2003 12:10:03 -0000 1.56 @@ -816,7 +816,7 @@ where parameter_id = :parameter_id; delete from apm_parameters where parameter_id = :parameter_id; - acs_object.delete(:parameter_id); + acs_object.del(:parameter_id); end; } } Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 19 Sep 2003 16:13:25 -0000 1.10 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 30 Sep 2003 12:10:03 -0000 1.11 @@ -31,7 +31,7 @@ begin - acs_user.delete( + acs_user.del( user_id => :user_id ); end; @@ -41,7 +41,7 @@ - select person.delete(:person_id) from dual; + select person.del(:person_id) from dual; Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/membership-rel-procs-oracle.xql 4 Jul 2002 13:43:52 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs-oracle.xql 30 Sep 2003 12:10:03 -0000 1.3 @@ -17,7 +17,7 @@ - begin membership_rel.deleted(rel_id => :rel_id); end; + begin membership_rel.del(rel_id => :rel_id); end; Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql 29 Sep 2003 11:52:31 -0000 1.15 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql 30 Sep 2003 12:10:03 -0000 1.16 @@ -5,7 +5,7 @@ - begin site_node.delete(:node_id); end; + begin site_node.del(:node_id); end; Index: openacs-4/packages/address-book/sql/oracle/address-book-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/sql/oracle/address-book-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/sql/oracle/address-book-create.sql 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/sql/oracle/address-book-create.sql 30 Sep 2003 12:10:03 -0000 1.2 @@ -104,7 +104,7 @@ type_id in ab_contact_attr_types.type_id%TYPE ) return ab_contact_attr_types.type_name%TYPE; - procedure delete ( + procedure del ( type_id in ab_contact_attr_types.type_id%TYPE ); @@ -166,13 +166,13 @@ end name; - procedure delete ( + procedure del ( type_id in ab_contact_attr_types.type_id%TYPE ) is begin - acs_object.delete(type_id); - end delete; + acs_object.del(type_id); + end del; end ab_contact_attr_type; / @@ -289,7 +289,7 @@ attr_id_two in ab_contact_attrs.attr_id%TYPE ); - procedure delete ( + procedure del ( attr_id in ab_contact_attrs.attr_id%TYPE ); @@ -399,13 +399,13 @@ end swap_sort; - procedure delete ( + procedure del ( attr_id in ab_contact_attrs.attr_id%TYPE ) is begin - acs_object.delete(attr_id); - end delete; + acs_object.del(attr_id); + end del; end ab_contact_attr; / @@ -462,7 +462,7 @@ category in ab_contact_rels.category%TYPE default null ) return ab_contact_rels.rel_id%TYPE; - procedure delete ( + procedure del ( rel_id in ab_contact_rels.rel_id%TYPE ); @@ -505,13 +505,13 @@ return v_rel_id; end new; - procedure delete ( + procedure del ( rel_id in ab_contact_rels.rel_id%TYPE ) is begin - acs_object.delete(rel_id); - end delete; + acs_object.del(rel_id); + end del; end ab_contact_rel; / @@ -549,7 +549,7 @@ contact_id in ab_contacts.contact_id%TYPE ) return varchar2; - procedure delete ( + procedure del ( contact_id in ab_contacts.contact_id%TYPE, delete_orphan_addresses_p in char default 't' ); @@ -649,7 +649,7 @@ return v_name; end name; - procedure delete ( + procedure del ( contact_id in ab_contacts.contact_id%TYPE, delete_orphan_addresses_p in char default 't' ) @@ -668,16 +668,16 @@ v_rel_id subplace_rels.rel_id%TYPE; begin -- First blow away attributes - for v_ab_contact_attrs_row in (select attr_id from ab_contact_attrs where contact_id = ab_contact.delete.contact_id) loop - ab_contact_attr.delete(v_ab_contact_attrs_row.attr_id); + for v_ab_contact_attrs_row in (select attr_id from ab_contact_attrs where contact_id = ab_contact.del.contact_id) loop + ab_contact_attr.del(v_ab_contact_attrs_row.attr_id); end loop; -- Then iterate through address location relations - for v_addresses_located_row in (select * from pl_addresses_located where locatee_id = ab_contact.delete.contact_id) loop + for v_addresses_located_row in (select * from pl_addresses_located where locatee_id = ab_contact.del.contact_id) loop -- Delete the rel - subplace_rel.delete(v_addresses_located_row.rel_id); + subplace_rel.del(v_addresses_located_row.rel_id); -- If we're deleting orphans then @@ -693,20 +693,20 @@ open subplace_rel_cursor(address_id => v_addresses_located_row.address_id); fetch subplace_rel_cursor into v_rel_id; if not subplace_rel_cursor%NOTFOUND then - subplace_rel.delete(v_rel_id); + subplace_rel.del(v_rel_id); end if; close subplace_rel_cursor; -- Delete the address itself - pl_address.delete(v_addresses_located_row.address_id); + pl_address.del(v_addresses_located_row.address_id); end if; end if; end loop; - acs_object.delete(contact_id); - end delete; + acs_object.del(contact_id); + end del; function work_phone ( contact_id in ab_contacts.contact_id%TYPE Index: openacs-4/packages/address-book/sql/oracle/address-book-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/sql/oracle/address-book-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/sql/oracle/address-book-drop.sql 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/sql/oracle/address-book-drop.sql 30 Sep 2003 12:10:03 -0000 1.2 @@ -12,7 +12,7 @@ v_row ab_contact_attrs%ROWTYPE; begin for v_row in object_id_c loop - ab_contact_attr.delete(v_row.attr_id); + ab_contact_attr.del(v_row.attr_id); end loop; end; / @@ -25,7 +25,7 @@ v_row ab_contact_rels%ROWTYPE; begin for v_row in object_id_c loop - ab_contact_rel.delete(v_row.rel_id); + ab_contact_rel.del(v_row.rel_id); end loop; end; / @@ -38,7 +38,7 @@ v_row ab_contact_attr_types%ROWTYPE; begin for v_row in object_id_c loop - ab_contact_attr_type.delete(v_row.type_id); + ab_contact_attr_type.del(v_row.type_id); end loop; end; / @@ -50,7 +50,7 @@ v_row ab_contacts%ROWTYPE; begin for v_row in object_id_c loop - ab_contact.delete(v_row.contact_id); + ab_contact.del(v_row.contact_id); end loop; end; / Index: openacs-4/packages/address-book/www/address-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/address-delete-oracle.xql 22 Aug 2001 23:11:49 -0000 1.1 +++ openacs-4/packages/address-book/www/address-delete-oracle.xql 30 Sep 2003 12:10:03 -0000 1.2 @@ -7,7 +7,7 @@ begin - location_rel.delete(:rel_id); + location_rel.del(:rel_id); end; @@ -29,10 +29,10 @@ open subplace_rel_cursor; fetch subplace_rel_cursor into v_rel_id; if not subplace_rel_cursor%NOTFOUND then - subplace_rel.delete(v_rel_id); + subplace_rel.del(v_rel_id); end if; close subplace_rel_cursor; - pl_address.delete(:address_id); + pl_address.del(:address_id); end; Index: openacs-4/packages/address-book/www/address-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/address-book/www/address-delete.tcl 25 Sep 2003 12:08:21 -0000 1.2 +++ openacs-4/packages/address-book/www/address-delete.tcl 30 Sep 2003 12:10:03 -0000 1.3 @@ -16,7 +16,7 @@ db_exec_plsql delete_location_rel { begin - location_rel.delete(:rel_id); + location_rel.del(:rel_id); end; } @@ -47,13 +47,13 @@ open subplace_rel_cursor; fetch subplace_rel_cursor into v_rel_id; if not subplace_rel_cursor%NOTFOUND then - subplace_rel.delete(v_rel_id); + subplace_rel.del(v_rel_id); end if; close subplace_rel_cursor; - pl_address.delete(:address_id); + pl_address.del(:address_id); end; } } } -ad_returnredirect contact-view?contact_id=$contact_id \ No newline at end of file +ad_returnredirect contact-view?contact_id=$contact_id Index: openacs-4/packages/address-book/www/attr-ae-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/attr-ae-2-oracle.xql 22 Aug 2001 23:11:49 -0000 1.1 +++ openacs-4/packages/address-book/www/attr-ae-2-oracle.xql 30 Sep 2003 12:10:03 -0000 1.2 @@ -22,7 +22,7 @@ - begin ab_contact_attr.delete(:attr_id); end; + begin ab_contact_attr.del(:attr_id); end; Index: openacs-4/packages/address-book/www/attr-ae-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/attr-ae-2.tcl 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/www/attr-ae-2.tcl 30 Sep 2003 12:10:03 -0000 1.2 @@ -42,8 +42,8 @@ where attr_id = :attr_id } } else { - db_exec_plsql delete_empty_attr "begin ab_contact_attr.delete(:attr_id); end;" + db_exec_plsql delete_empty_attr "begin ab_contact_attr.del(:attr_id); end;" } } -ad_returnredirect contact-view?contact_id=$contact_id \ No newline at end of file +ad_returnredirect contact-view?contact_id=$contact_id Index: openacs-4/packages/address-book/www/attr-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/attr-delete-oracle.xql 22 Aug 2001 23:11:49 -0000 1.1 +++ openacs-4/packages/address-book/www/attr-delete-oracle.xql 30 Sep 2003 12:10:03 -0000 1.2 @@ -6,7 +6,7 @@ - begin ab_contact_attr.delete(:attr_id); end; + begin ab_contact_attr.del(:attr_id); end; Index: openacs-4/packages/address-book/www/attr-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/attr-delete.tcl 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/www/attr-delete.tcl 30 Sep 2003 12:10:03 -0000 1.2 @@ -18,7 +18,7 @@ }] db_exec_plsql delete_attr { - begin ab_contact_attr.delete(:attr_id); end; + begin ab_contact_attr.del(:attr_id); end; } -ad_returnredirect contact-view?contact_id=$contact_id \ No newline at end of file +ad_returnredirect contact-view?contact_id=$contact_id Index: openacs-4/packages/address-book/www/contact-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/address-book/www/contact-delete-oracle.xql 28 Aug 2001 23:51:54 -0000 1.2 +++ openacs-4/packages/address-book/www/contact-delete-oracle.xql 30 Sep 2003 12:10:03 -0000 1.3 @@ -7,7 +7,7 @@ begin - ab_contact_rel.delete(:rel_id); + ab_contact_rel.del(:rel_id); end; @@ -29,7 +29,7 @@ begin -- Delete the contact, blowing away orphan addresses. - ab_contact.delete(contact_id => :contact_id, + ab_contact.del(contact_id => :contact_id, delete_orphan_addresses_p => 't'); end; Index: openacs-4/packages/address-book/www/contact-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/address-book/www/contact-delete.tcl 25 Sep 2003 12:08:21 -0000 1.3 +++ openacs-4/packages/address-book/www/contact-delete.tcl 30 Sep 2003 12:10:03 -0000 1.4 @@ -16,7 +16,7 @@ db_transaction { db_exec_plsql delete_ab_contact_rel { begin - ab_contact_rel.delete(:rel_id); + ab_contact_rel.del(:rel_id); end; } @@ -46,7 +46,7 @@ db_exec_plsql delete_orphan_address { begin -- Delete the contact, blowing away orphan addresses. - ab_contact.delete(contact_id => :contact_id, + ab_contact.del(contact_id => :contact_id, delete_orphan_addresses_p => 't'); end; } Index: openacs-4/packages/bookmarks/sql/oracle/bookmarks-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/sql/oracle/bookmarks-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/bookmarks/sql/oracle/bookmarks-create.sql 9 Mar 2002 02:00:02 -0000 1.4 +++ openacs-4/packages/bookmarks/sql/oracle/bookmarks-create.sql 30 Sep 2003 12:10:03 -0000 1.5 @@ -162,7 +162,7 @@ context_id in acs_objects.context_id%TYPE default null ) return bm_urls.url_id%TYPE; - procedure delete ( + procedure del ( url_id in bm_urls.url_id%TYPE ); @@ -216,13 +216,13 @@ return v_url_id; end new; - procedure delete ( + procedure del ( url_id in bm_urls.url_id%TYPE ) is begin - acs_object.delete(url.delete.url_id); - end delete; + acs_object.del(url.del.url_id); + end del; function insert_or_update ( url_title in bm_urls.url_title%TYPE, @@ -286,7 +286,7 @@ context_id in acs_objects.context_id%TYPE default null ) return bm_bookmarks.bookmark_id%TYPE; - procedure delete ( + procedure del ( bookmark_id in bm_bookmarks.bookmark_id%TYPE ); @@ -423,7 +423,7 @@ -- The reason this procedure is so terribly complex is that I wanted to enable -- deleting of non empty folders. The problem is that we have to delete the bookmarks -- in the right order not to violate any referential constraints. - procedure delete ( + procedure del ( bookmark_id in bm_bookmarks.bookmark_id%TYPE ) is @@ -436,15 +436,15 @@ from bm_bookmarks where bookmark_id not in (select bookmark_id from bm_bookmarks start with bookmark_id = (select parent_id from bm_bookmarks - where bookmark_id = bookmark.delete.bookmark_id) + where bookmark_id = bookmark.del.bookmark_id) connect by prior parent_id = bookmark_id) start with bookmark_id in (select bookmark_id from bm_bookmarks bm_outer where not exists (select 1 from bm_bookmarks bm_inner where bm_outer.bookmark_id = bm_inner.parent_id) intersect select bookmark_id from bm_bookmarks - start with bookmark_id = bookmark.delete.bookmark_id + start with bookmark_id = bookmark.del.bookmark_id connect by prior bookmark_id = parent_id ) connect by prior parent_id = bookmark_id; @@ -460,7 +460,7 @@ where parent_id = (select parent_id from bm_bookmarks where bookmark_id = tree_id) and not exists (select 1 from bm_bookmarks where parent_id = bm_outer.bookmark_id) and bm_outer.bookmark_id in (select bookmark_id from bm_bookmarks - start with bookmark_id = bookmark.delete.bookmark_id + start with bookmark_id = bookmark.del.bookmark_id connect by prior bookmark_id = parent_id); begin @@ -473,11 +473,11 @@ delete from acs_permissions where object_id = one_level_bookmark_id.bookmark_id; delete from bm_in_closed_p where bookmark_id = one_level_bookmark_id.bookmark_id; delete from bm_bookmarks where bookmark_id = one_level_bookmark_id.bookmark_id; - acs_object.delete(one_level_bookmark_id.bookmark_id); + acs_object.del(one_level_bookmark_id.bookmark_id); end loop; end loop; - end delete; + end del; function name ( object_id in bm_bookmarks.bookmark_id%TYPE Index: openacs-4/packages/bookmarks/sql/oracle/bookmarks-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/sql/oracle/bookmarks-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/bookmarks/sql/oracle/bookmarks-drop.sql 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/bookmarks/sql/oracle/bookmarks-drop.sql 30 Sep 2003 12:10:03 -0000 1.2 @@ -22,7 +22,7 @@ where parent_id not in (select bookmark_id from bm_bookmarks); begin for v_bookmark_id in c_bookmark_id loop - bookmark.delete(v_bookmark_id.bookmark_id); + bookmark.del(v_bookmark_id.bookmark_id); end loop; end; / @@ -51,7 +51,7 @@ from bm_urls; begin for v_url_id in c_url_id loop - url.delete(v_url_id.url_id); + url.del(v_url_id.url_id); end loop; end; / Index: openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql 23 Sep 2003 21:30:02 -0000 1.2 +++ openacs-4/packages/bookmarks/www/bookmark-delete-2-oracle.xql 30 Sep 2003 12:10:04 -0000 1.3 @@ -7,7 +7,7 @@ begin - bookmark.delete ( + bookmark.del ( bookmark_id => :bookmark_id ); end; Index: openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 10 Sep 2002 22:22:26 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 30 Sep 2003 12:10:04 -0000 1.4 @@ -23,7 +23,7 @@ if [catch {db_exec_plsql bookmark_delete " begin - bookmark.delete ( + bookmark.del ( bookmark_id => :bookmark_id ); end;"} errmsg] { Index: openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql 30 Jul 2001 00:00:02 -0000 1.1 +++ openacs-4/packages/bookmarks/www/delete-dead-links-oracle.xql 30 Sep 2003 12:10:04 -0000 1.2 @@ -19,7 +19,7 @@ begin - bookmark.delete ( + bookmark.del ( bookmark_id => :bookmark_id ); end; @@ -31,7 +31,7 @@ begin - bookmark.delete ( + bookmark.del ( bookmark_id => :bookmark_id ); end; Index: openacs-4/packages/bookmarks/www/delete-dead-links.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bookmarks/www/delete-dead-links.tcl 10 Sep 2002 22:22:26 -0000 1.2 +++ openacs-4/packages/bookmarks/www/delete-dead-links.tcl 30 Sep 2003 12:10:04 -0000 1.3 @@ -52,7 +52,7 @@ if [catch {db_exec_plsql delete_dead_link " begin - bookmark.delete ( + bookmark.del ( bookmark_id => :bookmark_id ); end;"} errmsg] { @@ -71,7 +71,7 @@ # Delete the url it self if [catch {db_exec_plsql delete_dead_link " begin - url.delete ( + url.del ( url_id => :url_id ); end;"} errmsg] { Index: openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql 28 Aug 2003 09:45:29 -0000 1.3 +++ openacs-4/packages/bug-tracker/sql/oracle/bug-tracker-create-packages.sql 30 Sep 2003 12:10:04 -0000 1.4 @@ -11,7 +11,7 @@ procedure new ( package_id in integer ); - procedure delete ( + procedure del ( project_id in integer ); procedure keywords_delete ( @@ -42,7 +42,7 @@ component_id in integer, found_in_version in integer, summary in varchar2, - user_agent in varchar2 default '', + user_agent in varchar2 default null, comment_content in varchar2, comment_format in varchar2, creation_date in date default sysdate(), @@ -52,7 +52,7 @@ content_type in varchar2 default 'bt_bug_revision' ) return integer; - procedure delete ( + procedure del ( bug_id in integer ); @@ -100,7 +100,7 @@ creation_ip in varchar2 ) return integer; - procedure delete ( + procedure del ( patch_id in integer ); @@ -195,7 +195,7 @@ return; end new; - procedure delete ( + procedure del ( project_id in integer ) is @@ -207,23 +207,23 @@ select folder_id, root_keyword_id into v_folder_id, v_root_keyword_id from bt_projects - where project_id = bt_project.delete.project_id; + where project_id = bt_project.del.project_id; -- This get''s done in tcl before we are called ... for now -- Delete the bugs -- for rec in select item_id from cr_items where parent_id = v_folder_id -- loop - -- bt_bug.delete(rec.item_id); + -- bt_bug.del(rec.item_id); -- end loop; -- Delete the patches - for rec in (select patch_id from bt_patches where project_id = bt_project.delete.project_id) + for rec in (select patch_id from bt_patches where project_id = bt_project.del.project_id) loop - bt_patch.delete(rec.patch_id); + bt_patch.del(rec.patch_id); end loop; -- delete the content folder - content_folder.delete(v_folder_id); + content_folder.del(v_folder_id); -- delete the projects keywords bt_project.keywords_delete( @@ -232,12 +232,12 @@ ); -- These tables should really be set up to cascade - delete from bt_versions where project_id = bt_project.delete.project_id; - delete from bt_components where project_id = bt_project.delete.project_id; - delete from bt_user_prefs where project_id = bt_project.delete.project_id; + delete from bt_versions where project_id = bt_project.del.project_id; + delete from bt_components where project_id = bt_project.del.project_id; + delete from bt_user_prefs where project_id = bt_project.del.project_id; - delete from bt_projects where project_id = bt_project.delete.project_id; - end delete; + delete from bt_projects where project_id = bt_project.del.project_id; + end del; procedure keywords_delete ( project_id in integer, @@ -275,7 +275,7 @@ where content_keyword.is_leaf(keyword_id) = 't') loop if (delete_root_p = 't') or (rec.keyword_id != v_root_keyword_id) then - content_keyword.delete(rec.keyword_id); + content_keyword.del(rec.keyword_id); v_changed_p := 't'; end if; end loop; @@ -328,7 +328,7 @@ comment_format in varchar2, creation_date in date default sysdate(), creation_user in integer, - creation_ip in varchar2 default '', + creation_ip in varchar2 default null, item_subtype in varchar2 default 'bt_bug', content_type in varchar2 default 'bt_bug_revision' ) return integer @@ -412,7 +412,7 @@ return v_bug_id; end new; - procedure delete ( + procedure del ( bug_id in integer ) is @@ -422,22 +422,22 @@ -- Every bug is associated with a workflow case select case_id into v_case_id from workflow_cases - where object_id = bt_bug.delete.bug_id; + where object_id = bt_bug.del.bug_id; - foo := workflow_case_pkg.delete(v_case_id); + foo := workflow_case_pkg.del(v_case_id); -- Every bug may have notifications attached to it -- and there is one column in the notificaitons datamodel that doesn't -- cascade - for rec in (select notification_id from notifications where response_id = bt_bug.delete.bug_id) + for rec in (select notification_id from notifications where response_id = bt_bug.del.bug_id) loop - notification.delete (rec.notification_id); + notification.del (rec.notification_id); end loop; - acs_object.delete(bug_id); + acs_object.del(bug_id); return; - end delete; + end del; function name ( bug_id in integer @@ -595,15 +595,15 @@ end name; - procedure delete ( + procedure del ( patch_id in integer ) is begin - acs_object.delete( patch_id ); + acs_object.del( patch_id ); return; - end delete; + end del; end bt_patch; / Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs-oracle.xql 28 Sep 2003 01:28:18 -0000 1.3 +++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs-oracle.xql 30 Sep 2003 12:10:04 -0000 1.4 @@ -120,7 +120,7 @@ begin - bt_project.delete(:project_id); + bt_project.del(:project_id); end; Index: openacs-4/packages/bug-tracker/www/admin/category-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/bug-tracker/www/admin/category-delete-oracle.xql 5 Mar 2003 17:41:17 -0000 1.1 +++ openacs-4/packages/bug-tracker/www/admin/category-delete-oracle.xql 30 Sep 2003 12:10:04 -0000 1.2 @@ -6,7 +6,7 @@ begin - content_keyword.delete(:keyword_id); + content_keyword.del(:keyword_id); end; Index: openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-drop.sql 15 May 2002 22:07:52 -0000 1.1 +++ openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-drop.sql 30 Sep 2003 12:10:04 -0000 1.2 @@ -7,7 +7,7 @@ begin for row in (select bulk_mail_id from bulk_mail_messages) loop - bulk_mail.delete(row.bulk_mail_id); + bulk_mail.del(row.bulk_mail_id); end loop; end; / Index: openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-package-create.sql 28 Aug 2003 09:41:52 -0000 1.2 +++ openacs-4/packages/bulk-mail/sql/oracle/bulk-mail-package-create.sql 30 Sep 2003 12:10:04 -0000 1.3 @@ -26,7 +26,7 @@ context_id in acs_objects.context_id%TYPE default null ) return bulk_mail_messages.bulk_mail_id%TYPE; - procedure delete ( + procedure del ( bulk_mail_id in bulk_mail_messages.bulk_mail_id%TYPE ); @@ -91,19 +91,19 @@ end new; - procedure delete ( + procedure del ( bulk_mail_id in bulk_mail_messages.bulk_mail_id%TYPE ) is begin delete from bulk_mail_messages - where bulk_mail_messages.bulk_mail_id = bulk_mail.delete.bulk_mail_id; + where bulk_mail_messages.bulk_mail_id = bulk_mail.del.bulk_mail_id; - acs_object.delete(bulk_mail.delete.bulk_mail_id); + acs_object.del(bulk_mail.del.bulk_mail_id); - end delete; + end del; end bulk_mail; / Index: openacs-4/packages/calendar/sql/oracle/cal-item-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/oracle/cal-item-create.sql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/calendar/sql/oracle/cal-item-create.sql 25 Apr 2002 16:42:26 -0000 1.8 +++ openacs-4/packages/calendar/sql/oracle/cal-item-create.sql 30 Sep 2003 12:10:04 -0000 1.9 @@ -105,7 +105,7 @@ ) return cal_items.cal_item_id%TYPE; -- delete cal_item - procedure delete ( + procedure del ( cal_item_id in cal_items.cal_item_id%TYPE ); @@ -200,22 +200,22 @@ end new; - procedure delete ( + procedure del ( cal_item_id in cal_items.cal_item_id%TYPE ) is begin -- Erase the cal_item assoicated with the id delete from cal_items - where cal_item_id = cal_item.delete.cal_item_id; + where cal_item_id = cal_item.del.cal_item_id; -- Erase all the privileges delete from acs_permissions - where object_id = cal_item.delete.cal_item_id; + where object_id = cal_item.del.cal_item_id; - acs_event.delete(cal_item_id); - end delete; + acs_event.del(cal_item_id); + end del; procedure delete_all ( recurrence_id in acs_events.recurrence_id%TYPE @@ -226,10 +226,10 @@ (select * from acs_events where recurrence_id = delete_all.recurrence_id) LOOP - cal_item.delete(v_event_id.event_id); + cal_item.del(v_event_id.event_id); end LOOP; - recurrence.delete(recurrence_id); + recurrence.del(recurrence_id); end delete_all; -- functions to return the name of the cal_item Index: openacs-4/packages/calendar/sql/oracle/calendar-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/oracle/calendar-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/calendar/sql/oracle/calendar-create.sql 16 Mar 2002 21:06:44 -0000 1.3 +++ openacs-4/packages/calendar/sql/oracle/calendar-create.sql 30 Sep 2003 12:10:04 -0000 1.4 @@ -267,7 +267,7 @@ ) return calendars.calendar_id%TYPE; - procedure delete ( + procedure del ( calendar_id in calendars.calendar_id%TYPE ); @@ -403,32 +403,32 @@ -- body for procedure delete - procedure delete ( + procedure del ( calendar_id in calendars.calendar_id%TYPE ) is begin -- First erase all the item relate to this calendar. delete from calendars - where calendar_id = calendar.delete.calendar_id; + where calendar_id = calendar.del.calendar_id; -- Delete all privileges associate with this calendar delete from acs_permissions - where object_id = calendar.delete.calendar_id; + where object_id = calendar.del.calendar_id; -- Delete all privilges of the cal_items that's associated -- with this calendar delete from acs_permissions where object_id in ( select cal_item_id from cal_items - where on_which_calendar = calendar.delete.calendar_id + where on_which_calendar = calendar.del.calendar_id ); - acs_object.delete(calendar_id); - end delete; + acs_object.del(calendar_id); + end del; Index: openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql 30 Nov 2002 17:27:51 -0000 1.6 +++ openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql 30 Sep 2003 12:10:04 -0000 1.7 @@ -71,7 +71,7 @@ begin - cal_item.delete ( + cal_item.del ( cal_item_id => :cal_item_id ); end; Index: openacs-4/packages/categories/sql/oracle/category-package.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/oracle/category-package.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/sql/oracle/category-package.sql 23 Apr 2003 12:29:27 -0000 1.1 +++ openacs-4/packages/categories/sql/oracle/category-package.sql 30 Sep 2003 12:10:04 -0000 1.2 @@ -203,7 +203,7 @@ delete from category_object_map where category_id = node.category_id; delete from category_translations where category_id = node.category_id; delete from categories where category_id = node.category_id; - acs_object.delete(node.category_id); + acs_object.del(node.category_id); end loop; update categories Index: openacs-4/packages/categories/sql/oracle/category-tree-package.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/oracle/category-tree-package.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/sql/oracle/category-tree-package.sql 9 May 2003 06:08:04 -0000 1.2 +++ openacs-4/packages/categories/sql/oracle/category-tree-package.sql 30 Sep 2003 12:10:04 -0000 1.3 @@ -178,7 +178,7 @@ delete from category_tree_translations where tree_id = category_tree.del.tree_id; delete from category_trees where tree_id = category_tree.del.tree_id; - acs_object.delete(category_tree.del.tree_id); + acs_object.del(category_tree.del.tree_id); END del; Index: openacs-4/packages/categories/tcl/categories-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/categories-procs.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/tcl/categories-procs.tcl 19 May 2003 13:10:17 -0000 1.3 +++ openacs-4/packages/categories/tcl/categories-procs.tcl 30 Sep 2003 12:10:05 -0000 1.4 @@ -308,11 +308,11 @@ @author Timo Hentschel (thentschel@sussdorff-roy.com) } { - acs_sc::impl::new -contract_name AcsObject -name category_idhandler -owner categories + acs_sc::impl::new -contract_name AcsObject -name category_idhandler -pretty_name "Category tree handler" -owner categories acs_sc::impl::alias::new -contract_name AcsObject -impl_name category_idhandler -operation PageUrl -alias category::pageurl acs_sc::impl::binding::new -contract_name AcsObject -impl_name category_idhandler - acs_sc::impl::new -contract_name AcsObject -name category_tree_idhandler -owner categories + acs_sc::impl::new -contract_name AcsObject -name category_tree_idhandler -pretty_name "Category tree handler" -owner categories acs_sc::impl::alias::new -contract_name AcsObject -impl_name category_tree_idhandler -operation PageUrl -alias category_tree::pageurl acs_sc::impl::binding::new -contract_name AcsObject -impl_name category_tree_idhandler } Index: openacs-4/packages/chat/sql/oracle/chat-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/oracle/chat-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/chat/sql/oracle/chat-create.sql 20 Apr 2001 20:51:08 -0000 1.1 +++ openacs-4/packages/chat/sql/oracle/chat-create.sql 30 Sep 2003 12:10:05 -0000 1.2 @@ -244,7 +244,7 @@ object_type in acs_objects.object_type%TYPE default 'chat_room' ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( room_id in chat_rooms.room_id%TYPE ); @@ -298,7 +298,7 @@ object_type in acs_objects.object_type%TYPE default 'chat_transcript' ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( transcript_id in chat_transcripts.transcript_id%TYPE ); @@ -364,22 +364,22 @@ return v_room_id; end new; - procedure delete ( + procedure del ( room_id in chat_rooms.room_id%TYPE ) is begin -- First erase all the messages relate to this chat room. - delete from chat_msgs where room_id = chat_room.delete.room_id; + delete from chat_msgs where room_id = chat_room.del.room_id; -- Delete all privileges associate with this room - delete from acs_permissions where object_id = chat_room.delete.room_id; + delete from acs_permissions where object_id = chat_room.del.room_id; -- Now delete the chat room itself. - delete from chat_rooms where room_id = chat_room.delete.room_id; + delete from chat_rooms where room_id = chat_room.del.room_id; - acs_object.delete(room_id); - end delete; + acs_object.del(room_id); + end del; procedure edit ( room_id in chat_rooms.room_id%TYPE, @@ -522,20 +522,20 @@ return v_transcript_id; end new; - procedure delete ( + procedure del ( transcript_id in chat_transcripts.transcript_id%TYPE ) is begin -- Delete all privileges associate with this transcript - delete from acs_permissions where object_id = chat_transcript.delete.transcript_id; + delete from acs_permissions where object_id = chat_transcript.del.transcript_id; delete from chat_transcripts - where transcript_id = chat_transcript.delete.transcript_id; + where transcript_id = chat_transcript.del.transcript_id; - acs_object.delete(transcript_id); - end delete; + acs_object.del(transcript_id); + end del; procedure edit ( transcript_id in chat_transcripts.transcript_id%TYPE, Index: openacs-4/packages/chat/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/chat/tcl/chat-procs.tcl 20 Apr 2001 20:51:08 -0000 1.1 +++ openacs-4/packages/chat/tcl/chat-procs.tcl 30 Sep 2003 12:10:05 -0000 1.2 @@ -202,7 +202,7 @@ } { db_exec_plsql delete_room { begin - chat_room.delete(:room_id); + chat_room.del(:room_id); end; } } @@ -520,7 +520,7 @@ } { db_exec_plsql delete_transcript { begin - chat_transcript.delete(:transcript_id); + chat_transcript.del(:transcript_id); end; } } Index: openacs-4/packages/cms/sql/oracle/cms-fix.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/oracle/cms-fix.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/sql/oracle/cms-fix.sql 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/cms/sql/oracle/cms-fix.sql 30 Sep 2003 12:10:05 -0000 1.2 @@ -49,7 +49,7 @@ delete from acs_permissions where object_id in (select module_id from cm_modules); for v_module_val in c_module_cur loop - acs_object.delete( v_module_val.module_id ); + acs_object.del( v_module_val.module_id ); end loop; acs_object_type.drop_type ( 'content_module' ); Index: openacs-4/packages/cms/www/modules/categories/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/categories/delete-oracle.xql 26 May 2001 19:45:03 -0000 1.2 +++ openacs-4/packages/cms/www/modules/categories/delete-oracle.xql 30 Sep 2003 12:10:05 -0000 1.3 @@ -5,7 +5,7 @@ - begin :1 := content_keyword.delete(:id); end; + begin :1 := content_keyword.del(:id); end; Index: openacs-4/packages/cms/www/modules/categories/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/cms/www/modules/categories/delete.tcl 16 Aug 2002 00:25:33 -0000 1.4 +++ openacs-4/packages/cms/www/modules/categories/delete.tcl 30 Sep 2003 12:10:05 -0000 1.5 @@ -20,7 +20,7 @@ db_transaction { # Otherwise, delete the folder - set delete_keyword [db_exec_plsql delete_keyword "begin :1 := content_keyword.delete(:id); end;"] + set delete_keyword [db_exec_plsql delete_keyword "begin :1 := content_keyword.del(:id); end;"] } # Remove it from the clipboard, if it exists Index: openacs-4/packages/cms/www/modules/items/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/items/delete-oracle.xql 25 May 2001 04:56:36 -0000 1.1 +++ openacs-4/packages/cms/www/modules/items/delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -7,7 +7,7 @@ begin - content_item.delete( + content_item.del( item_id => :item_id ); end; Index: openacs-4/packages/cms/www/modules/items/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/items/delete.tcl 16 Aug 2002 03:57:48 -0000 1.3 +++ openacs-4/packages/cms/www/modules/items/delete.tcl 30 Sep 2003 12:10:06 -0000 1.4 @@ -14,7 +14,7 @@ db_exec_plsql item_delete " begin - content_item.delete( + content_item.del( item_id => :item_id ); end;" Index: openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql 30 May 2001 22:56:27 -0000 1.3 +++ openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql 30 Sep 2003 12:10:06 -0000 1.4 @@ -45,31 +45,31 @@ - content_symlink.delete + content_symlink.del - content_folder.delete + content_folder.del - content_template.delete + content_template.del - content_item.delete + content_item.del Index: openacs-4/packages/cms/www/modules/sitemap/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/Attic/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/sitemap/delete-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/sitemap/delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -5,7 +5,7 @@ - begin content_folder.delete(:id); end; + begin content_folder.del(:id); end; Index: openacs-4/packages/cms/www/modules/sitemap/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/sitemap/delete.tcl 19 Aug 2002 03:54:52 -0000 1.3 +++ openacs-4/packages/cms/www/modules/sitemap/delete.tcl 30 Sep 2003 12:10:06 -0000 1.4 @@ -26,7 +26,7 @@ # Otherwise, delete the folder db_transaction { - db_exec_plsql delete_folder "begin content_folder.delete(:id); end;" + db_exec_plsql delete_folder "begin content_folder.del(:id); end;" } # Remove it from the clipboard, if it exists Index: openacs-4/packages/cms/www/modules/templates/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/templates/delete-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/templates/delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -5,7 +5,7 @@ - begin content_template.delete(:template_id); end; + begin content_template.del(:template_id); end; Index: openacs-4/packages/cms/www/modules/templates/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/templates/delete.tcl 25 May 2001 02:15:56 -0000 1.2 +++ openacs-4/packages/cms/www/modules/templates/delete.tcl 30 Sep 2003 12:10:06 -0000 1.3 @@ -15,7 +15,7 @@ db_transaction { foreach template_id [ns_querygetall template_id] { - db_exec_plsql delete "begin content_template.delete(:template_id); end;" + db_exec_plsql delete "begin content_template.del(:template_id); end;" } } } Index: openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql 8 Jun 2001 01:44:53 -0000 1.2 +++ openacs-4/packages/cms/www/modules/templates/template-delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.3 @@ -7,7 +7,7 @@ begin - content_template.delete(:template_id); + content_template.del(:template_id); end; Index: openacs-4/packages/cms/www/modules/templates/template-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/cms/www/modules/templates/template-delete.tcl 19 Aug 2002 04:19:45 -0000 1.4 +++ openacs-4/packages/cms/www/modules/templates/template-delete.tcl 30 Sep 2003 12:10:06 -0000 1.5 @@ -22,7 +22,7 @@ db_transaction { db_exec_plsql delete_template " begin - content_template.delete(:template_id); + content_template.del(:template_id); end;" } Index: openacs-4/packages/cms/www/modules/types/content_symlink/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content_symlink/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/types/content_symlink/delete-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/types/content_symlink/delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -6,7 +6,7 @@ - begin content_symlink.delete(:id); end; + begin content_symlink.del(:id); end; Index: openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl 24 May 2001 23:57:17 -0000 1.2 +++ openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl 30 Sep 2003 12:10:06 -0000 1.3 @@ -6,7 +6,7 @@ db_transaction { db_exec_plsql symlink_delete " - begin content_symlink.delete(:id); end;" + begin content_symlink.del(:id); end;" } template::forward "../../sitemap/refresh-tree?id=$parent_id" Index: openacs-4/packages/cms/www/modules/users/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/users/delete-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/users/delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -5,7 +5,7 @@ - begin acs_group.delete(:id); end; + begin acs_group.del(:id); end; Index: openacs-4/packages/cms/www/modules/users/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/users/delete.tcl 20 Aug 2002 11:17:31 -0000 1.3 +++ openacs-4/packages/cms/www/modules/users/delete.tcl 30 Sep 2003 12:10:06 -0000 1.4 @@ -20,7 +20,7 @@ # Otherwise, delete the group db_transaction { - db_exec_plsql delete_group "begin acs_group.delete(:id); end;" + db_exec_plsql delete_group "begin acs_group.del(:id); end;" } # Remove it from the clipboard, if it exists Index: openacs-4/packages/cms/www/modules/users/user-assoc-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-assoc-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/users/user-assoc-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/users/user-assoc-oracle.xql 30 Sep 2003 12:10:06 -0000 1.2 @@ -22,7 +22,7 @@ loop fetch c_rel_cur into v_id; exit when c_rel_cur%NOTFOUND; - membership_rel.delete(v_id); + membership_rel.del(v_id); end loop; end; Index: openacs-4/packages/cms/www/modules/users/user-assoc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-assoc.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/users/user-assoc.tcl 8 Jun 2001 01:44:53 -0000 1.3 +++ openacs-4/packages/cms/www/modules/users/user-assoc.tcl 30 Sep 2003 12:10:06 -0000 1.4 @@ -28,7 +28,7 @@ loop fetch c_rel_cur into v_id; exit when c_rel_cur%NOTFOUND; - membership_rel.delete(v_id); + membership_rel.del(v_id); end loop; end;" } errmsg] } { Index: openacs-4/packages/cronjob/sql/oracle/cronjob-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/sql/oracle/cronjob-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cronjob/sql/oracle/cronjob-create.sql 15 Nov 2001 20:29:36 -0000 1.2 +++ openacs-4/packages/cronjob/sql/oracle/cronjob-create.sql 30 Sep 2003 12:10:06 -0000 1.3 @@ -69,7 +69,7 @@ context_id in acs_objects.context_id%TYPE default null ) return cronjobs.cronjob_id%TYPE; - procedure delete ( + procedure del ( cronjob_id in cronjobs.cronjob_id%TYPE ); procedure set_attrs ( @@ -155,20 +155,20 @@ return v_cronjob_id; end new; - procedure delete ( + procedure del ( cronjob_id in cronjobs.cronjob_id%TYPE ) is begin - if cronjob_p(cronjob.delete.cronjob_id) = 'f' then + if cronjob_p(cronjob.del.cronjob_id) = 'f' then return; end if; delete from cronjobs - where cronjob_id = cronjob.delete.cronjob_id; + where cronjob_id = cronjob.del.cronjob_id; - acs_object.delete(cronjob_id); - end delete; + acs_object.del(cronjob_id); + end del; procedure set_attrs ( cronjob_id in cronjobs.cronjob_id%TYPE, Index: openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql 30 Nov 2002 17:30:07 -0000 1.2 +++ openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql 30 Sep 2003 12:10:06 -0000 1.3 @@ -6,7 +6,7 @@ begin - cronjob.delete(cronjob_id => :cronjob_id); + cronjob.del(cronjob_id => :cronjob_id); end; Index: openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl 30 Nov 2002 17:30:07 -0000 1.3 +++ openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl 30 Sep 2003 12:10:06 -0000 1.4 @@ -14,7 +14,7 @@ db_exec_plsql edit_cronjob { begin - cronjob.delete(cronjob_id => :cronjob_id); + cronjob.del(cronjob_id => :cronjob_id); end; } Index: openacs-4/packages/curriculum/sql/oracle/curriculum-curriculum-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/sql/oracle/curriculum-curriculum-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/curriculum/sql/oracle/curriculum-curriculum-package-create.sql 10 Jun 2003 09:28:50 -0000 1.3 +++ openacs-4/packages/curriculum/sql/oracle/curriculum-curriculum-package-create.sql 30 Sep 2003 12:10:06 -0000 1.4 @@ -121,7 +121,7 @@ delete from cu_curriculums where curriculum_id = cu_curriculum.del.curriculum_id; - acs_object.delete(cu_curriculum.del.curriculum_id); + acs_object.del(cu_curriculum.del.curriculum_id); end del; end cu_curriculum; Index: openacs-4/packages/curriculum/sql/oracle/curriculum-element-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/sql/oracle/curriculum-element-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/curriculum/sql/oracle/curriculum-element-package-create.sql 10 Jun 2003 09:28:50 -0000 1.2 +++ openacs-4/packages/curriculum/sql/oracle/curriculum-element-package-create.sql 30 Sep 2003 12:10:06 -0000 1.3 @@ -120,7 +120,7 @@ delete from cu_elements where element_id = cu_element.del.element_id; - acs_object.delete(element_id); + acs_object.del(element_id); end del; end cu_element; Index: openacs-4/packages/curriculum/tcl/curriculum-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/tcl/curriculum-procs-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/curriculum/tcl/curriculum-procs-oracle.xql 3 Jun 2003 10:28:20 -0000 1.1 +++ openacs-4/packages/curriculum/tcl/curriculum-procs-oracle.xql 30 Sep 2003 12:10:07 -0000 1.2 @@ -13,7 +13,7 @@ declare begin - :1 := workflow_case.delete(:case_id); + :1 := workflow_case.del(:case_id); end; Index: openacs-4/packages/download/sql/oracle/download-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/oracle/download-drop.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/sql/oracle/download-drop.sql 23 May 2001 18:44:13 -0000 1.4 +++ openacs-4/packages/download/sql/oracle/download-drop.sql 30 Sep 2003 12:10:07 -0000 1.5 @@ -10,7 +10,7 @@ begin for archive_rec in (select item_id from cr_items where content_type = 'cr_download_archive_desc') loop - content_item.delete(archive_rec.item_id); + content_item.del(archive_rec.item_id); end loop; end; / @@ -19,7 +19,7 @@ begin for archive_rec in (select item_id from cr_items where content_type = 'cr_download_archive') loop - content_item.delete(archive_rec.item_id); + content_item.del(archive_rec.item_id); end loop; end; / @@ -28,7 +28,7 @@ begin for archive_rec in (select item_id from cr_items where content_type = 'cr_download_rep') loop - content_item.delete(archive_rec.item_id); + content_item.del(archive_rec.item_id); end loop; end; / Index: openacs-4/packages/download/sql/oracle/download-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/oracle/download-packages.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/download/sql/oracle/download-packages.sql 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/download/sql/oracle/download-packages.sql 30 Sep 2003 12:10:07 -0000 1.2 @@ -51,7 +51,7 @@ modifying_ip in acs_objects.modifying_ip%TYPE default null ); - procedure delete ( + procedure del ( repository_id in acs_objects.object_id%TYPE ); @@ -134,17 +134,17 @@ end edit; - procedure delete ( + procedure del ( repository_id in acs_objects.object_id%TYPE ) is begin - update acs_objects set context_id = null where context_id = download_rep.delete.repository_id; + update acs_objects set context_id = null where context_id = download_rep.del.repository_id; delete from download_repository - where repository_id = download_rep.delete.repository_id; + where repository_id = download_rep.del.repository_id; - acs_object.delete(repository_id); + acs_object.del(repository_id); end; end download_rep; Index: openacs-4/packages/ecommerce/sql/oracle/ec-product-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/oracle/ec-product-package-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ecommerce/sql/oracle/ec-product-package-create.sql 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/ecommerce/sql/oracle/ec-product-package-create.sql 30 Sep 2003 12:10:07 -0000 1.2 @@ -45,7 +45,7 @@ announcements_expire in ec_products.announcements_expire%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( product_id in ec_products.product_id%TYPE ); @@ -105,15 +105,15 @@ return v_object_id; end new; - procedure delete ( + procedure del ( product_id in ec_products.product_id%TYPE ) is begin delete from ec_products - where product_id = ec_product.delete.product_id; - acs_object.delete(product_id); - end delete; + where product_id = ec_product.del.product_id; + acs_object.del(product_id); + end del; end ec_product; / Index: openacs-4/packages/ecommerce/www/admin/products/delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/delete-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/products/delete-2-oracle.xql 10 Jul 2001 20:33:53 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/products/delete-2-oracle.xql 30 Sep 2003 12:10:07 -0000 1.2 @@ -7,7 +7,7 @@ begin - ec_product.delete(:product_id); + ec_product.del(:product_id); end; Index: openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl 18 Sep 2002 21:33:53 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl 30 Sep 2003 12:10:07 -0000 1.4 @@ -170,7 +170,7 @@ # with ec_product.delete pl/sql procedure db_exec_plsql product_delete { begin - ec_product.delete(:product_id); + ec_product.del(:product_id); end; } Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 28 Aug 2003 09:41:53 -0000 1.8 +++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 30 Sep 2003 12:10:07 -0000 1.9 @@ -457,4 +457,4 @@ table_name => 'etp_page_revisions', -- table_name id_column => 'etp_page_revision_id', -- id_column name_method => 'content_revision__revision_name' -- name_method -); +) from dual; Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-drop.sql 12 Feb 2002 00:02:13 -0000 1.2 +++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-drop.sql 30 Sep 2003 12:10:07 -0000 1.3 @@ -29,7 +29,7 @@ begin for cur_val in subsite_values loop - apm_parameter_value.delete ( + apm_parameter_value.del ( value_id => cur_val.value_id ); end loop; Index: openacs-4/packages/edit-this-page/www/etp-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-delete-oracle.xql 31 Oct 2001 04:24:17 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-delete-oracle.xql 30 Sep 2003 12:10:07 -0000 1.3 @@ -5,7 +5,7 @@ begin - content_item.delete(:revision_id) + content_item.del(:revision_id) end; Index: openacs-4/packages/edit-this-page/www/etp-revert-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-revert-oracle.xql 31 Oct 2001 04:44:07 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-revert-oracle.xql 30 Sep 2003 12:10:07 -0000 1.3 @@ -5,7 +5,7 @@ begin - content_revision.delete(:revision_id); + content_revision.del(:revision_id); end; Index: openacs-4/packages/edit-this-page/www/etp-revision-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-revision-delete-oracle.xql 4 Apr 2003 15:59:38 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-revision-delete-oracle.xql 30 Sep 2003 12:10:07 -0000 1.3 @@ -5,7 +5,7 @@ begin - content_revision.delete(:revision_id); + content_revision.del(:revision_id); end; Index: openacs-4/packages/faq/sql/oracle/faq-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/oracle/faq-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/faq/sql/oracle/faq-create.sql 30 Nov 2002 17:32:48 -0000 1.3 +++ openacs-4/packages/faq/sql/oracle/faq-create.sql 30 Sep 2003 12:10:07 -0000 1.4 @@ -99,8 +99,8 @@ procedure clone ( - old_package_id in apm_packages.package_id%TYPE, - new_package_id in apm_packages.package_id%TYPE + old_package_id in apm_packages.package_id%TYPE default NULL, + new_package_id in apm_packages.package_id%TYPE default NULL ); @@ -153,7 +153,7 @@ is begin delete from faq_q_and_as where entry_id = faq.delete_q_and_a.entry_id; - acs_object.delete(entry_id); + acs_object.del(entry_id); end delete_q_and_a; @@ -211,7 +211,7 @@ end; delete from faqs where faq_id=faq.delete_faq.faq_id; - acs_object.delete(faq_id); + acs_object.del(faq_id); end delete_faq; Index: openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql 7 Jul 2003 12:37:39 -0000 1.9 +++ openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql 30 Sep 2003 12:10:07 -0000 1.10 @@ -19,9 +19,9 @@ from fs_root_folders; begin for v_root_folder in c_root_folders loop - -- JS: The RI constraints will cause acs_objects.delete to fail - -- JS: So I changed this to apm_package.delete - apm_package.delete(v_root_folder.package_id); + -- JS: The RI constraints will cause acs_objects.del to fail + -- JS: So I changed this to apm_package.del + apm_package.del(v_root_folder.package_id); end loop; end; / Index: openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql 28 Aug 2003 09:41:53 -0000 1.6 +++ openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql 30 Sep 2003 12:10:07 -0000 1.7 @@ -321,7 +321,7 @@ ) is begin - content_item.delete(item_id => file_storage.delete_file.file_id); + content_item.del(item_id => file_storage.delete_file.file_id); end delete_file; procedure rename_file( @@ -564,12 +564,12 @@ begin if file_storage.delete_version.version_id = content_item.get_live_revision(file_storage.delete_version.file_id) then - content_revision.delete(file_storage.delete_version.version_id); + content_revision.del(file_storage.delete_version.version_id); content_item.set_live_revision( content_item.get_latest_revision(file_storage.delete_version.file_id) ); else - content_revision.delete(file_storage.delete_version.version_id); + content_revision.del(file_storage.delete_version.version_id); end if; -- If the live revision is null, we have deleted the last version above @@ -648,7 +648,7 @@ ) is begin - content_folder.delete( + content_folder.del( folder_id => file_storage.delete_folder.folder_id ); end delete_folder; @@ -676,25 +676,25 @@ -- of deletion of revisions. if v_rec.content_type = 'file_storage_object' then - content_item.delete(v_rec.item_id); + content_item.del(v_rec.item_id); end if; -- Instead of doing an if-else, we make sure we are deleting a folder. if v_rec.content_type = 'content_folder' then - content_folder.delete(v_rec.item_id); + content_folder.del(v_rec.item_id); end if; -- Instead of doing an if-else, we make sure we are deleting a folder. if v_rec.content_type = 'content_symlink' then - content_symlink.delete(v_rec.item_id); + content_symlink.del(v_rec.item_id); end if; -- Instead of doing an if-else, we make sure we are deleting a folder. if v_rec.content_type = 'content_extlink' then - content_extlink.delete(v_rec.item_id); + content_extlink.del(v_rec.item_id); end if; end loop; @@ -707,7 +707,7 @@ after delete on fs_root_folders for each row begin - content_folder.delete(:old.folder_id); + content_folder.del(:old.folder_id); end; / show errors; Index: openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 22 Sep 2003 21:37:37 -0000 1.2 +++ openacs-4/packages/forums/sql/oracle/forums-forums-drop.sql 30 Sep 2003 12:10:07 -0000 1.3 @@ -56,7 +56,7 @@ select MAX(object_id) into v_object_id from acs_objects where object_type='forums_forum'; While (v_object_id > 0) loop delete from ncanotes where object_id=v_object_id; - acs_object.delete( + acs_object.del( v_object_id -- object_id ); select MAX(object_id) into v_object_id from acs_objects where object_type='forums_forum'; Index: openacs-4/packages/forums/sql/oracle/forums-forums-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-package-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/sql/oracle/forums-forums-package-create.sql 30 Nov 2002 17:34:49 -0000 1.4 +++ openacs-4/packages/forums/sql/oracle/forums-forums-package-create.sql 30 Sep 2003 12:10:07 -0000 1.5 @@ -32,7 +32,7 @@ forum_id in forums_forums.forum_id%TYPE ) return varchar; - procedure delete ( + procedure del ( forum_id in forums_forums.forum_id%TYPE ); @@ -90,13 +90,13 @@ return v_name; end name; - procedure delete ( + procedure del ( forum_id in forums_forums.forum_id%TYPE ) is begin - acs_object.delete(forum_id); - end delete; + acs_object.del(forum_id); + end del; end forums_forum; / Index: openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql 30 Nov 2002 17:34:49 -0000 1.4 +++ openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql 30 Sep 2003 12:10:07 -0000 1.5 @@ -43,7 +43,7 @@ message_id in forums_messages.message_id%TYPE ); - procedure delete ( + procedure del ( message_id in forums_messages.message_id%TYPE ); @@ -199,13 +199,13 @@ where message_id = thread_close.message_id; end thread_close; - procedure delete ( + procedure del ( message_id in forums_messages.message_id%TYPE ) is begin - acs_object.delete(message_id); - end delete; + acs_object.del(message_id); + end del; procedure delete_thread ( message_id in forums_messages.message_id%TYPE @@ -235,11 +235,11 @@ and tree_sortkey between tree.left(v_sortkey) and tree.right(v_sortkey) order by tree_sortkey desc) loop - forums_message.delete(v_message.message_id); + forums_message.del(v_message.message_id); end loop; -- delete the message itself - forums_message.delete(delete_thread.message_id); + forums_message.del(delete_thread.message_id); end delete_thread; function name ( Index: openacs-4/packages/forums/sql/oracle/forums-notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-notifications-init.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/forums/sql/oracle/forums-notifications-init.sql 17 Sep 2003 13:58:46 -0000 1.3 +++ openacs-4/packages/forums/sql/oracle/forums-notifications-init.sql 30 Sep 2003 12:10:07 -0000 1.4 @@ -19,6 +19,7 @@ impl_id := acs_sc_impl.new ( impl_contract_name => 'NotificationType', impl_name => 'forums_forum_notif_type', + impl_pretty_name => 'forums_forum_notif_type', impl_owner_name => 'forums' ); @@ -67,6 +68,7 @@ impl_id := acs_sc_impl.new ( impl_contract_name => 'NotificationType', impl_name => 'forums_message_notif_type', + impl_pretty_name => 'forums_message_notif_type', impl_owner_name => 'forums' ); Index: openacs-4/packages/forums/sql/oracle/forums-notifications-sanitize.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-notifications-sanitize.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/forums/sql/oracle/forums-notifications-sanitize.sql 22 Sep 2003 21:37:37 -0000 1.3 +++ openacs-4/packages/forums/sql/oracle/forums-notifications-sanitize.sql 30 Sep 2003 12:10:07 -0000 1.4 @@ -41,10 +41,10 @@ from notification_types where short_name in ('forums_forum_notif')) loop - notification_type.delete(row.type_id); + notification_type.del(row.type_id); end loop; - acs_sc_binding.delete( + acs_sc_binding.del( contract_name => 'NotificationType', impl_name => 'forums_forum_notif_type' ); @@ -61,7 +61,7 @@ 'ProcessReply' ); - acs_sc_impl.delete( + acs_sc_impl.del( 'NotificationType', 'forums_forum_notif_type' ); @@ -95,10 +95,10 @@ from notification_types where short_name in ('forums_message_notif')) loop - notification_type.delete(row.type_id); + notification_type.del(row.type_id); end loop; - acs_sc_binding.delete( + acs_sc_binding.del( contract_name => 'NotificationType', impl_name => 'forums_message_notif_type' ); @@ -115,7 +115,7 @@ 'ProcessReply' ); - acs_sc_impl.delete( + acs_sc_impl.del( 'NotificationType', 'forums_message_notif_type' ); Index: openacs-4/packages/general-comments/sql/oracle/general-comments-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/sql/oracle/general-comments-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/general-comments/sql/oracle/general-comments-drop.sql 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/sql/oracle/general-comments-drop.sql 30 Sep 2003 12:10:07 -0000 1.2 @@ -37,7 +37,7 @@ from cr_items where parent_id = comment_rec.comment_id); - acs_message.delete(comment_rec.comment_id); + acs_message.del(comment_rec.comment_id); end loop; end; / Index: openacs-4/packages/general-comments/www/delete-attachment-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/delete-attachment-2-oracle.xql 14 Jun 2001 19:52:22 -0000 1.1 +++ openacs-4/packages/general-comments/www/delete-attachment-2-oracle.xql 30 Sep 2003 12:10:07 -0000 1.2 @@ -51,7 +51,7 @@ begin - content_extlink.delete(:attach_id); + content_extlink.del(:attach_id); end; Index: openacs-4/packages/general-comments/www/delete-attachment-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/delete-attachment-2.tcl 7 Nov 2002 08:32:49 -0000 1.3 +++ openacs-4/packages/general-comments/www/delete-attachment-2.tcl 30 Sep 2003 12:10:07 -0000 1.4 @@ -65,7 +65,7 @@ } elseif { $content_type == "content_extlink" } { db_exec_plsql delete_extlink { begin - content_extlink.delete(:attach_id); + content_extlink.del(:attach_id); end; } } Index: openacs-4/packages/general-comments/www/admin/delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/admin/delete-2-oracle.xql 14 Jun 2001 19:52:22 -0000 1.1 +++ openacs-4/packages/general-comments/www/admin/delete-2-oracle.xql 30 Sep 2003 12:10:07 -0000 1.2 @@ -7,7 +7,7 @@ begin - acs_message.delete(:comment_id); + acs_message.del(:comment_id); end; Index: openacs-4/packages/general-comments/www/admin/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/admin/delete-2.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/admin/delete-2.tcl 30 Sep 2003 12:10:07 -0000 1.3 @@ -30,7 +30,7 @@ # relies on "on delete cascade" db_exec_plsql delete_comment { begin - acs_message.delete(:comment_id); + acs_message.del(:comment_id); end; } Index: openacs-4/packages/glossary/sql/oracle/glossary-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/oracle/glossary-drop.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/glossary/sql/oracle/glossary-drop.sql 23 Dec 2001 00:58:58 -0000 1.4 +++ openacs-4/packages/glossary/sql/oracle/glossary-drop.sql 30 Sep 2003 12:10:07 -0000 1.5 @@ -86,7 +86,7 @@ loop fetch terms_drop into object_id; exit when terms_drop%NOTFOUND; - content_item.delete( item_id => object_id); + content_item.del( item_id => object_id); end loop; commit; end; @@ -117,7 +117,7 @@ loop fetch glossaries_drop into object_id; exit when glossaries_drop%NOTFOUND; - content_item.delete( item_id => object_id); + content_item.del( item_id => object_id); end loop; commit; end; Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-drop.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-drop.sql 28 Aug 2003 09:41:54 -0000 1.3 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-drop.sql 30 Sep 2003 12:10:08 -0000 1.4 @@ -25,10 +25,10 @@ -- delete comments (which are acs_message's) for comment in (select comment_id from general_comments where object_id = blog_entry.entry_id) loop - acs_message.delete(comment.comment_id); + acs_message.del(comment.comment_id); end loop; - pinds_blog_entry.delete(blog_entry.entry_id); + pinds_blog_entry.del(blog_entry.entry_id); end loop; acs_object_type.drop_type('pinds_blog_entry', 't'); Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 28 Aug 2003 09:41:54 -0000 1.3 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 30 Sep 2003 12:10:08 -0000 1.4 @@ -23,7 +23,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return pinds_blog_entries.entry_id%TYPE; - procedure delete ( + procedure del ( entry_id in pinds_blog_entries.entry_id%TYPE ); @@ -91,19 +91,19 @@ end new; - procedure delete ( + procedure del ( entry_id in pinds_blog_entries.entry_id%TYPE ) is begin delete from pinds_blog_entries - where entry_id = pinds_blog_entry.delete.entry_id; + where entry_id = pinds_blog_entry.del.entry_id; - acs_object.delete(pinds_blog_entry.delete.entry_id); + acs_object.del(pinds_blog_entry.del.entry_id); - end delete; + end del; function title ( entry_id in pinds_blog_entries.entry_id%TYPE @@ -139,7 +139,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return weblogger_channels.channel_id%TYPE; - procedure delete ( + procedure del ( channel_id in weblogger_channels.channel_id%TYPE ); @@ -185,19 +185,19 @@ end new; - procedure delete ( + procedure del ( channel_id in weblogger_channels.channel_id%TYPE ) is begin delete from weblogger_channels - where channel_id = weblogger_channel.delete.channel_id; + where channel_id = weblogger_channel.del.channel_id; - acs_object.delete(weblogger_channel.delete.channel_id); + acs_object.del(weblogger_channel.del.channel_id); - end delete; + end del; end weblogger_channel; / Index: openacs-4/packages/lars-blogger/sql/oracle/notifications-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/notifications-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/sql/oracle/notifications-drop.sql 28 Aug 2003 09:41:54 -0000 1.2 +++ openacs-4/packages/lars-blogger/sql/oracle/notifications-drop.sql 30 Sep 2003 12:10:08 -0000 1.3 @@ -14,7 +14,7 @@ from notification_types where short_name in ('lars_blogger_notif_type')) loop - notification_type.delete(row.type_id); + notification_type.del(row.type_id); end loop; end; / Index: openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 14 Sep 2002 21:43:33 -0000 1.1 +++ openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 30 Sep 2003 12:10:08 -0000 1.2 @@ -19,6 +19,7 @@ impl_id := acs_sc_impl.new ( 'NotificationType', 'lars_blogger_notif_type', + 'lars_blogger_notif_type', 'lars-blogger' ); Index: openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql 28 Aug 2003 09:41:54 -0000 1.3 +++ openacs-4/packages/lars-blogger/sql/oracle/rss-register.sql 30 Sep 2003 12:10:08 -0000 1.4 @@ -14,6 +14,7 @@ impl_id := acs_sc_impl.new( impl_contract_name => 'RssGenerationSubscriber', impl_name => 'pinds_blog_entries', + impl_pretty_name => 'pinds_blog_entries', impl_owner_name => 'lars-blogger' ); Index: openacs-4/packages/lars-blogger/sql/oracle/rss-unregister.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/rss-unregister.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/sql/oracle/rss-unregister.sql 28 Aug 2003 09:41:54 -0000 1.2 +++ openacs-4/packages/lars-blogger/sql/oracle/rss-unregister.sql 30 Sep 2003 12:10:08 -0000 1.3 @@ -11,7 +11,7 @@ begin - acs_sc_impl.delete( + acs_sc_impl.del( impl_contract_name => 'RssGenerationSubscriber', impl_name => 'pinds_blog_entries' ); Index: openacs-4/packages/logger/sql/oracle/logger-packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/oracle/logger-packages-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/logger/sql/oracle/logger-packages-create.sql 1 May 2003 09:59:32 -0000 1.5 +++ openacs-4/packages/logger/sql/oracle/logger-packages-create.sql 30 Sep 2003 12:10:08 -0000 1.6 @@ -151,7 +151,7 @@ -- as well as all projections in the project -- acs_object.delete should delete permissions for us but this change is not on cvs head yet delete from acs_permissions where object_id = project_id; - acs_object.delete(project_id); + acs_object.del(project_id); end del; @@ -209,7 +209,7 @@ -- Everything should be set up to cascade -- acs_object.delete should delete permissions for us but this change is not on cvs head yet delete from acs_permissions where object_id = variable_id; - acs_object.delete(variable_id); + acs_object.del(variable_id); end del; function name ( @@ -269,7 +269,7 @@ -- The row in the entries table will cascade -- acs_object.delete should delete permissions for us but this change is not on cvs head yet delete from acs_permissions where object_id = entry_id; - acs_object.delete(entry_id); + acs_object.del(entry_id); end del; function name ( Index: openacs-4/packages/news/sql/oracle/news-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/oracle/news-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/news/sql/oracle/news-create.sql 28 Aug 2003 09:41:57 -0000 1.6 +++ openacs-4/packages/news/sql/oracle/news-create.sql 30 Sep 2003 12:10:08 -0000 1.7 @@ -220,7 +220,7 @@ is_live_p in varchar2 default 'f' ) return cr_news.news_id%TYPE; - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ); @@ -421,7 +421,7 @@ -- deletes a news item along with all its revisions and possibnle attachements - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ) is v_item_id cr_items.item_id%TYPE; @@ -433,7 +433,7 @@ and ao.context_id = v_item_id; begin - v_item_id := news.delete.item_id; + v_item_id := news.del.item_id; dbms_output.put_line('Deleting associated comments...'); -- delete acs_messages, images, comments to news item for v_cm in comment_cursor loop @@ -442,16 +442,16 @@ where image_id in (select latest_revision from cr_items where parent_id = v_cm.message_id); - acs_message.delete(v_cm.message_id); + acs_message.del(v_cm.message_id); delete from general_comments where comment_id = v_cm.message_id; end loop; delete from cr_news where news_id in (select revision_id from cr_revisions where item_id = v_item_id); - content_item.delete(v_item_id); - end delete; + content_item.del(v_item_id); + end del; -- (re)-publish a news item out of the archive by nulling the archive_date @@ -756,7 +756,7 @@ delete from cr_news where news_id = news.revision_delete.revision_id; -- delete revision - content_revision.delete( + content_revision.del( revision_id => news.revision_delete.revision_id ); end revision_delete; Index: openacs-4/packages/news/sql/oracle/news-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/oracle/news-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news/sql/oracle/news-drop.sql 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/news/sql/oracle/news-drop.sql 30 Sep 2003 12:10:08 -0000 1.2 @@ -25,7 +25,7 @@ LOOP FETCH item_cursor into v_item_id; -- all attached types/item are deleted in news.delete - modify there - news.delete(v_item_id); + news.del(v_item_id); EXIT WHEN item_cursor%NOTFOUND; END LOOP; CLOSE item_cursor; @@ -46,7 +46,7 @@ delete from cr_folder_type_map where content_type = 'news'; -- delete news folder - content_folder.delete(v_folder_id); + content_folder.del(v_folder_id); end; / Index: openacs-4/packages/news/tcl/news-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/news/tcl/news-procs-oracle.xql 30 Nov 2002 17:39:09 -0000 1.3 +++ openacs-4/packages/news/tcl/news-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.4 @@ -31,7 +31,7 @@ begin - news.delete(:id); + news.del(:id); end; Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/news/tcl/news-procs.tcl 28 Aug 2003 09:41:57 -0000 1.9 +++ openacs-4/packages/news/tcl/news-procs.tcl 30 Sep 2003 12:10:08 -0000 1.10 @@ -59,7 +59,7 @@ foreach id $id_list { db_exec_plsql news_item_delete { begin - news.delete(:id); + news.del(:id); end; } } Index: openacs-4/packages/news/tcl/test/news-db-test-init-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/test/news-db-test-init-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news/tcl/test/news-db-test-init-oracle.xql 4 Apr 2003 09:48:13 -0000 1.1 +++ openacs-4/packages/news/tcl/test/news-db-test-init-oracle.xql 30 Sep 2003 12:10:08 -0000 1.2 @@ -12,15 +12,15 @@ begin - apm_package.delete(:p_package_id); + apm_package.del(:p_package_id); end; begin - apm_package.delete(:p_package_id); + apm_package.del(:p_package_id); end; @@ -126,7 +126,7 @@ begin - news.delete(:p_item_id); + news.del(:p_item_id); end; Index: openacs-4/packages/news/tcl/test/news-db-test-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/test/news-db-test-init.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news/tcl/test/news-db-test-init.tcl 4 Apr 2003 09:48:13 -0000 1.1 +++ openacs-4/packages/news/tcl/test/news-db-test-init.tcl 30 Sep 2003 12:10:08 -0000 1.2 @@ -74,7 +74,7 @@ set p_package_id $_news_package_id db_exec_plsql package-delete { begin - apm_package.delete(:p_package_id); + apm_package.del(:p_package_id); end; } } @@ -101,7 +101,7 @@ set p_package_id $_news_package_id db_exec_plsql package-delete { begin - apm_package.delete(:p_package_id) + apm_package.del(:p_package_id) } } } @@ -194,7 +194,7 @@ aa_export_vars {p_item_id} db_exec_plsql item-delete { begin - news.delete(:p_item_id); + news.del(:p_item_id); end; } } Index: openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/sql/oracle/Attic/news-aggregator-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-drop.sql 28 Aug 2003 09:41:57 -0000 1.2 +++ openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-drop.sql 30 Sep 2003 12:10:08 -0000 1.3 @@ -10,7 +10,7 @@ for na_source in (select source_id from na_sources) loop - na_source.delete(na_source.source_id); + na_source.del(na_source.source_id); end loop; acs_object_type.drop_type( Index: openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/sql/oracle/Attic/news-aggregator-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-package-create.sql 28 Aug 2003 09:41:57 -0000 1.2 +++ openacs-4/packages/news-aggregator/sql/oracle/news-aggregator-package-create.sql 30 Sep 2003 12:10:08 -0000 1.3 @@ -20,7 +20,7 @@ creation_ip in acs_objects.creation_ip%TYPE default null ) return na_sources.source_id%TYPE; - procedure delete ( + procedure del ( source_id in na_sources.source_id%TYPE ); @@ -86,19 +86,19 @@ end new; - procedure delete ( + procedure del ( source_id in na_sources.source_id%TYPE ) is begin delete from na_sources - where source_id = na_source.delete.source_id; + where source_id = na_source.del.source_id; - acs_object.delete(na_source.delete.source_id); + acs_object.del(na_source.del.source_id); - end delete; + end del; function title ( source_id in na_sources.source_id%TYPE Index: openacs-4/packages/news-aggregator/www/subscriptions-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/subscriptions-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/news-aggregator/www/subscriptions-oracle.xql 28 Aug 2003 09:41:57 -0000 1.2 +++ openacs-4/packages/news-aggregator/www/subscriptions-oracle.xql 30 Sep 2003 12:10:08 -0000 1.3 @@ -5,7 +5,7 @@ - :1 := na_source.delete( + :1 := na_source.del( source_id => :delete_id ); end; Index: openacs-4/packages/notes/sql/oracle/notes-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notes/sql/oracle/notes-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/notes/sql/oracle/notes-create.sql 10 Oct 2001 05:16:23 -0000 1.3 +++ openacs-4/packages/notes/sql/oracle/notes-create.sql 30 Sep 2003 12:10:08 -0000 1.4 @@ -66,7 +66,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notes.note_id%TYPE; - procedure delete ( + procedure del ( note_id in notes.note_id%TYPE ); @@ -119,19 +119,19 @@ return v_note_id; end new; - procedure delete ( + procedure del ( note_id in notes.note_id%TYPE ) is begin delete from acs_permissions - where object_id = note.delete.note_id; + where object_id = note.del.note_id; delete from notes - where note_id = note.delete.note_id; + where note_id = note.del.note_id; - acs_object.delete(note_id); - end delete; + acs_object.del(note_id); + end del; function name ( note_id in notes.note_id%TYPE Index: openacs-4/packages/notes/www/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/notes/www/delete-oracle.xql 3 May 2001 18:23:35 -0000 1.1 +++ openacs-4/packages/notes/www/delete-oracle.xql 30 Sep 2003 12:10:08 -0000 1.2 @@ -7,7 +7,7 @@ begin - note.delete(:note_id); + note.del(:note_id); end; Index: openacs-4/packages/notes/www/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notes/www/delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/notes/www/delete.tcl 5 Sep 2002 11:04:56 -0000 1.3 +++ openacs-4/packages/notes/www/delete.tcl 30 Sep 2003 12:10:08 -0000 1.4 @@ -13,7 +13,7 @@ db_exec_plsql note_delete { begin - note.delete(:note_id); + note.del(:note_id); end; } Index: openacs-4/packages/notifications/sql/oracle/notifications-core-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-core-drop.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/notifications/sql/oracle/notifications-core-drop.sql 22 Sep 2003 20:56:10 -0000 1.4 +++ openacs-4/packages/notifications/sql/oracle/notifications-core-drop.sql 30 Sep 2003 12:10:08 -0000 1.5 @@ -39,7 +39,7 @@ while (v_object_id > 0) loop delete from acs_permissions where object_id = v_object_id; - acs_object.delete( + acs_object.del( v_object_id ); Index: openacs-4/packages/notifications/sql/oracle/notifications-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-package-create.sql,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/notifications/sql/oracle/notifications-package-create.sql 28 Aug 2003 09:41:58 -0000 1.9 +++ openacs-4/packages/notifications/sql/oracle/notifications-package-create.sql 30 Sep 2003 12:10:08 -0000 1.10 @@ -23,7 +23,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notification_intervals.interval_id%TYPE; - procedure delete ( + procedure del ( interval_id in notification_intervals.interval_id%TYPE ); @@ -63,13 +63,13 @@ return v_interval_id; end new; - procedure delete ( + procedure del ( interval_id in notification_intervals.interval_id%TYPE ) is begin - acs_object.delete(interval_id); - end delete; + acs_object.del(interval_id); + end del; end notification_interval; / @@ -91,7 +91,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notification_delivery_methods.delivery_method_id%TYPE; - procedure delete ( + procedure del ( delivery_method_id in notification_delivery_methods.delivery_method_id%TYPE ); @@ -132,13 +132,13 @@ return v_delivery_method_id; end new; - procedure delete ( + procedure del ( delivery_method_id in notification_delivery_methods.delivery_method_id%TYPE ) is begin - acs_object.delete (delivery_method_id); - end delete; + acs_object.del (delivery_method_id); + end del; end notification_delivery_method; / @@ -161,7 +161,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notification_types.type_id%TYPE; - procedure delete ( + procedure del ( type_id in notification_types.type_id%TYPE default null ); @@ -203,13 +203,13 @@ return v_type_id; end new; - procedure delete ( + procedure del ( type_id in notification_types.type_id%TYPE default null ) is begin - acs_object.delete(type_id); - end delete; + acs_object.del(type_id); + end del; end notification_type; / @@ -237,7 +237,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notification_requests.request_id%TYPE; - procedure delete ( + procedure del ( request_id in notification_requests.request_id%TYPE default null ); @@ -284,7 +284,7 @@ return v_request_id; end new; - procedure delete ( + procedure del ( request_id in notification_requests.request_id%TYPE default null ) is @@ -294,10 +294,10 @@ where n.response_id = nr.object_id and nr.request_id = request_id) loop - acs_object.delete(v_notifications.notification_id); + acs_object.del(v_notifications.notification_id); end loop; - acs_object.delete(request_id); - end delete; + acs_object.del(request_id); + end del; procedure delete_all ( object_id in notification_requests.object_id%TYPE default null @@ -308,7 +308,7 @@ for v_request in (select request_id from notification_requests where object_id= delete_all.object_id) LOOP - notification_request.delete(v_request.request_id); + notification_request.del(v_request.request_id); END LOOP; end delete_all; @@ -340,7 +340,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notifications.notification_id%TYPE; - procedure delete ( + procedure del ( notification_id in notifications.notification_id%TYPE default null ); @@ -388,15 +388,15 @@ return v_notification_id; end new; - procedure delete ( + procedure del ( notification_id in notifications.notification_id%TYPE default null ) is begin - delete from notifications where notification_id = notification.delete.notification_id; + delete from notifications where notification_id = notification.del.notification_id; - acs_object.delete (notification_id); - end delete; + acs_object.del (notification_id); + end del; end notification; / Index: openacs-4/packages/notifications/sql/oracle/notifications-replies-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-replies-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/notifications/sql/oracle/notifications-replies-package-create.sql 9 Aug 2002 20:51:49 -0000 1.2 +++ openacs-4/packages/notifications/sql/oracle/notifications-replies-package-create.sql 30 Sep 2003 12:10:08 -0000 1.3 @@ -27,7 +27,7 @@ context_id in acs_objects.context_id%TYPE default null ) return notification_replies.reply_id%TYPE; - procedure delete ( + procedure del ( reply_id in notification_replies.reply_id%TYPE ); end notification_reply; @@ -70,13 +70,13 @@ return v_reply_id; end new; - procedure delete ( + procedure del ( reply_id in notification_replies.reply_id%TYPE ) is begin - acs_object.delete(object_id => reply_id); - end delete; + acs_object.del(object_id => reply_id); + end del; end notification_reply; / Index: openacs-4/packages/notifications/tcl/delivery-method-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/delivery-method-procs-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/notifications/tcl/delivery-method-procs-oracle.xql 28 Aug 2003 09:41:58 -0000 1.2 +++ openacs-4/packages/notifications/tcl/delivery-method-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.3 @@ -6,7 +6,7 @@ begin - notification_delivery_method.delete(:delivery_method_id); + notification_delivery_method.del(:delivery_method_id); end; Index: openacs-4/packages/notifications/tcl/notification-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/notifications/tcl/notification-procs-oracle.xql 20 Sep 2002 21:19:00 -0000 1.4 +++ openacs-4/packages/notifications/tcl/notification-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.5 @@ -6,7 +6,7 @@ declare begin - notification.delete(:notification_id); + notification.del(:notification_id); end; Index: openacs-4/packages/notifications/tcl/notification-reply-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-reply-procs-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/notifications/tcl/notification-reply-procs-oracle.xql 3 Jun 2002 22:27:00 -0000 1.2 +++ openacs-4/packages/notifications/tcl/notification-reply-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.3 @@ -6,7 +6,7 @@ declare begin - notification_reply.delete(reply_id => :reply_id); + notification_reply.del(reply_id => :reply_id); end; Index: openacs-4/packages/notifications/tcl/notification-request-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-request-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/notifications/tcl/notification-request-procs-oracle.xql 3 Jun 2002 22:27:00 -0000 1.3 +++ openacs-4/packages/notifications/tcl/notification-request-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.4 @@ -6,7 +6,7 @@ declare begin - notification_request.delete(request_id => :request_id); + notification_request.del(request_id => :request_id); end; Index: openacs-4/packages/notifications/tcl/notification-type-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-type-procs-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/notifications/tcl/notification-type-procs-oracle.xql 25 Feb 2003 10:07:13 -0000 1.1 +++ openacs-4/packages/notifications/tcl/notification-type-procs-oracle.xql 30 Sep 2003 12:10:08 -0000 1.2 @@ -6,7 +6,7 @@ begin - notification_type.delete(:type_id); + notification_type.del(:type_id); end; Index: openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql 14 Mar 2003 15:53:52 -0000 1.1 +++ openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql 30 Sep 2003 12:10:08 -0000 1.2 @@ -108,7 +108,7 @@ delete from organizations where organization_id = organization.del.p_organization_id; - party.delete(organization.del.p_organization_id); + party.del(organization.del.p_organization_id); end del; Index: openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/payflowpro/sql/oracle/Attic/payflowpro-sc-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-create.sql 5 Jun 2002 02:32:58 -0000 1.1 +++ openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-create.sql 30 Sep 2003 12:10:08 -0000 1.2 @@ -13,6 +13,7 @@ foo := acs_sc_impl.new( 'PaymentGateway', -- impl_contract_name 'payflowpro', -- impl_name + 'Payment Gateway', -- impl_pretty_name 'payflowpro' -- impl_owner_name ); Index: openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/payflowpro/sql/oracle/Attic/payflowpro-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-drop.sql 5 Jun 2002 02:32:58 -0000 1.1 +++ openacs-4/packages/payflowpro/sql/oracle/payflowpro-sc-drop.sql 30 Sep 2003 12:10:08 -0000 1.2 @@ -31,12 +31,12 @@ 'info' ); - acs_sc_binding.delete( + acs_sc_binding.del( contract_name => 'PaymentGateway', impl_name => 'payflowpro' ); - acs_sc_impl.delete( + acs_sc_impl.del( 'PaymentGateway', 'payflowpro' ); Index: openacs-4/packages/payment-gateway/sql/oracle/payment-gateway-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/payment-gateway/sql/oracle/payment-gateway-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/payment-gateway/sql/oracle/payment-gateway-sc-drop.sql 5 Jun 2002 02:32:58 -0000 1.1 +++ openacs-4/packages/payment-gateway/sql/oracle/payment-gateway-sc-drop.sql 30 Sep 2003 12:10:09 -0000 1.2 @@ -1,15 +1,15 @@ begin - acs_sc_contract.delete('PaymentGateway'); - acs_sc_msg_type.delete(null,'PaymentGateway.Authorize.InputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Authorize.OutputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.ChargeCard.InputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.ChargeCard.OutputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Return.InputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Return.OutputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Void.InputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Void.OutputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Info.InputType'); - acs_sc_msg_type.delete(null,'PaymentGateway.Info.OutputType'); + acs_sc_contract.del('PaymentGateway'); + acs_sc_msg_type.del(null,'PaymentGateway.Authorize.InputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Authorize.OutputType'); + acs_sc_msg_type.del(null,'PaymentGateway.ChargeCard.InputType'); + acs_sc_msg_type.del(null,'PaymentGateway.ChargeCard.OutputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Return.InputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Return.OutputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Void.InputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Void.OutputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Info.InputType'); + acs_sc_msg_type.del(null,'PaymentGateway.Info.OutputType'); end; / show errors Index: openacs-4/packages/photo-album/sql/oracle/pa-clip-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/pa-clip-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/photo-album/sql/oracle/pa-clip-drop.sql 12 Jun 2003 06:55:44 -0000 1.1 +++ openacs-4/packages/photo-album/sql/oracle/pa-clip-drop.sql 30 Sep 2003 12:10:09 -0000 1.2 @@ -14,7 +14,7 @@ begin for coll_val in coll_cursor loop - acs_object.delete (object_id => coll_val.object_id); + acs_object.del (object_id => coll_val.object_id); end loop; end; / Index: openacs-4/packages/photo-album/sql/oracle/photo-album-clip.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/photo-album-clip.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/photo-album/sql/oracle/photo-album-clip.sql 12 Jun 2003 06:55:44 -0000 1.1 +++ openacs-4/packages/photo-album/sql/oracle/photo-album-clip.sql 30 Sep 2003 12:10:09 -0000 1.2 @@ -77,7 +77,7 @@ p_context_id in acs_objects.context_id%TYPE default null ) return pa_collections.collection_id%TYPE; - procedure delete ( + procedure del ( p_collection_id in pa_collections.collection_id%TYPE ); @@ -127,7 +127,7 @@ end new; - procedure delete ( + procedure del ( p_collection_id in pa_collections.collection_id%TYPE ) is @@ -138,8 +138,8 @@ delete from pa_collections where collection_id = p_collection_id; - acs_object.delete(p_collection_id); - end delete; + acs_object.del(p_collection_id); + end del; function title ( Index: openacs-4/packages/photo-album/sql/oracle/photo-album-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/photo-album-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/sql/oracle/photo-album-drop.sql 12 Jun 2003 06:55:44 -0000 1.2 +++ openacs-4/packages/photo-album/sql/oracle/photo-album-drop.sql 30 Sep 2003 12:10:09 -0000 1.3 @@ -112,7 +112,7 @@ --begin -- for image_val in image_cursor -- loop --- image.delete ( +-- image.del ( -- item_id => image_val.item_id -- ); -- end loop; @@ -130,7 +130,7 @@ begin for photo_val in photo_cursor loop - pa_photo.delete ( + pa_photo.del ( item_id => photo_val.item_id ); end loop; @@ -148,7 +148,7 @@ begin for album_val in album_cursor loop - pa_album.delete ( + pa_album.del ( album_id => album_val.item_id ); end loop; @@ -212,7 +212,7 @@ -- folder is a root folder, delete it from maping table to avoid fk constraint violation delete from pa_package_root_folder_map where folder_id = folder_val.folder_id; end if; - content_folder.delete (folder_id => folder_val.folder_id); + content_folder.del (folder_id => folder_val.folder_id); end loop; end; / Index: openacs-4/packages/photo-album/sql/oracle/plsql-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/sql/oracle/plsql-packages.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/photo-album/sql/oracle/plsql-packages.sql 18 Jun 2003 12:11:17 -0000 1.3 +++ openacs-4/packages/photo-album/sql/oracle/plsql-packages.sql 30 Sep 2003 12:10:09 -0000 1.4 @@ -56,7 +56,7 @@ -- -- Be careful, cannot be undone (easily) --*/ - procedure delete ( + procedure del ( item_id in acs_objects.object_id%TYPE ); @@ -145,13 +145,13 @@ -- the on delete cascade will take care of this -- during the content_revision.delete begin - content_revision.delete ( + content_revision.del ( revision_id => revision_id ); end delete_revision; - procedure delete ( + procedure del ( item_id in acs_objects.object_id%TYPE ) is @@ -161,25 +161,25 @@ from cr_child_rels where - parent_id = pa_photo.delete.item_id; + parent_id = pa_photo.del.item_id; begin -- delete all the images associated with the photo for v_pa_image_val in pa_image_cur loop - image.delete ( + image.del ( item_id => v_pa_image_val.child_id ); end loop; -- content_item.delete takes care of all revision -- on delete cascades take care of rest - content_item.delete ( + content_item.del ( item_id => item_id ); - end delete; + end del; end pa_photo; / @@ -225,7 +225,7 @@ -- Album must be empty to be deleted, -- otherwise delete throws error --*/ - procedure delete ( + procedure del ( album_id in cr_items.item_id%TYPE ); @@ -308,13 +308,13 @@ -- the on delete cascade will take care of this -- during the content_revision.delete begin - content_revision.delete ( + content_revision.del ( revision_id => revision_id ); end delete_revision; - procedure delete ( + procedure del ( album_id in cr_items.item_id%TYPE ) is @@ -323,7 +323,7 @@ -- check if album is empty (no rm -r *) select count(*) into v_num_children from cr_items - where parent_id = pa_album.delete.album_id; + where parent_id = pa_album.del.album_id; if v_num_children > 0 then raise_application_error(-20000, @@ -334,11 +334,11 @@ -- content_item.delete takes care of all revision -- on delete cascades take care of rest - content_item.delete ( + content_item.del ( item_id => album_id ); - end delete; + end del; end pa_album; / Index: openacs-4/packages/photo-album/www/album-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/photo-album/www/album-delete-oracle.xql 10 Jun 2003 10:07:11 -0000 1.1 +++ openacs-4/packages/photo-album/www/album-delete-oracle.xql 30 Sep 2003 12:10:09 -0000 1.2 @@ -7,7 +7,7 @@ begin - pa_album.delete(:album_id); + pa_album.del(:album_id); end; Index: openacs-4/packages/photo-album/www/album-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/album-delete.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/album-delete.tcl 30 Sep 2003 12:10:09 -0000 1.3 @@ -39,7 +39,7 @@ db_exec_plsql album_delete " begin - pa_album.delete(:album_id); + pa_album.del(:album_id); end;" pa_flush_photo_in_album_cache $album_id Index: openacs-4/packages/photo-album/www/folder-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/photo-album/www/folder-delete-oracle.xql 10 Jun 2003 10:07:11 -0000 1.1 +++ openacs-4/packages/photo-album/www/folder-delete-oracle.xql 30 Sep 2003 12:10:09 -0000 1.2 @@ -7,7 +7,7 @@ begin - content_folder.delete(:folder_id); + content_folder.del(:folder_id); end; Index: openacs-4/packages/photo-album/www/folder-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/folder-delete.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/folder-delete.tcl 30 Sep 2003 12:10:09 -0000 1.3 @@ -47,7 +47,7 @@ db_exec_plsql folder_delete " begin - content_folder.delete(:folder_id); + content_folder.del(:folder_id); end;" ad_returnredirect "?folder_id=$parent_folder_id" Index: openacs-4/packages/photo-album/www/photo-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/photo-album/www/photo-delete-oracle.xql 10 Jun 2003 10:07:11 -0000 1.1 +++ openacs-4/packages/photo-album/www/photo-delete-oracle.xql 30 Sep 2003 12:10:09 -0000 1.2 @@ -7,7 +7,7 @@ begin - pa_photo.delete (:photo_id); + pa_photo.del (:photo_id); end; Index: openacs-4/packages/photo-album/www/photo-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/photo-delete.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/photo-delete.tcl 30 Sep 2003 12:10:09 -0000 1.3 @@ -38,7 +38,7 @@ db_exec_plsql drop_image { begin - pa_photo.delete (:photo_id); + pa_photo.del (:photo_id); end; } Index: openacs-4/packages/press/sql/oracle/press-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/press/sql/oracle/press-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/press/sql/oracle/press-create.sql 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/press/sql/oracle/press-create.sql 30 Sep 2003 12:10:09 -0000 1.2 @@ -374,7 +374,7 @@ creation_user in acs_objects.creation_user%TYPE default null ) return cr_press.press_id%TYPE; - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ); @@ -527,7 +527,7 @@ -- deletes a press item along with all its revisions - procedure delete ( + procedure del ( item_id in cr_items.item_id%TYPE ) is @@ -536,10 +536,10 @@ from cr_press where press_id in (select revision_id from cr_revisions - where item_id = press.delete.item_id); + where item_id = press.del.item_id); - content_item.delete( item_id => press.delete.item_id ); - end delete; + content_item.del( item_id => press.del.item_id ); + end del; -- make a press item permanent by nulling the archive_date -- this only applies to the currently active revision @@ -748,7 +748,7 @@ make_active_revision_p in varchar2 default 'f' ) return cr_revisions.revision_id%TYPE; - procedure delete ( + procedure del ( revision_id in cr_revisions.revision_id%TYPE ); end press_revision; @@ -856,17 +856,17 @@ return v_revision_id; end new; - procedure delete ( + procedure del ( revision_id in cr_revisions.revision_id%TYPE ) is begin - delete from cr_press where press_id = press_revision.delete.revision_id; + delete from cr_press where press_id = press_revision.del.revision_id; - content_revision.delete(press_revision.delete.revision_id); + content_revision.del(press_revision.del.revision_id); - end delete; + end del; end press_revision; / show errors Index: openacs-4/packages/press/sql/oracle/press-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/press/sql/oracle/press-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/press/sql/oracle/press-drop.sql 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/press/sql/oracle/press-drop.sql 30 Sep 2003 12:10:09 -0000 1.2 @@ -33,7 +33,7 @@ OPEN c_item_id; LOOP FETCH c_item_id into v_item_id; - content_item.delete(v_item_id); + content_item.del(v_item_id); EXIT WHEN c_item_id%NOTFOUND; END LOOP; CLOSE c_item_id; @@ -56,7 +56,7 @@ -- delete press folder - content_folder.delete(v_folder_id); + content_folder.del(v_folder_id); end; / Index: openacs-4/packages/press/tcl/press-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/press/tcl/press-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/press/tcl/press-procs.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/press/tcl/press-procs.tcl 30 Sep 2003 12:10:09 -0000 1.2 @@ -65,7 +65,7 @@ foreach id $id_list { db_exec_plsql press_item_delete { begin - press.delete(item_id => :id); + press.del(item_id => :id); end; } } Index: openacs-4/packages/ref-countries/sql/oracle/ref-countries-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/sql/oracle/ref-countries-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-countries/sql/oracle/ref-countries-drop.sql 27 Aug 2001 22:35:56 -0000 1.2 +++ openacs-4/packages/ref-countries/sql/oracle/ref-countries-drop.sql 30 Sep 2003 12:10:09 -0000 1.3 @@ -27,7 +27,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-currency/sql/oracle/ref-currency-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-currency/sql/oracle/ref-currency-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-currency/sql/oracle/ref-currency-drop.sql 27 Aug 2001 22:36:50 -0000 1.2 +++ openacs-4/packages/ref-currency/sql/oracle/ref-currency-drop.sql 30 Sep 2003 12:10:09 -0000 1.3 @@ -27,7 +27,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-itu/sql/common/ref-itu-data.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-itu/sql/common/ref-itu-data.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-itu/sql/common/ref-itu-data.sql 4 Mar 2003 22:48:50 -0000 1.2 +++ openacs-4/packages/ref-itu/sql/common/ref-itu-data.sql 30 Sep 2003 12:10:09 -0000 1.3 @@ -131,10 +131,10 @@ - AT&T + AT &T - AT&T International ATM Network + AT &T International ATM Network +882 17 @@ -454,7 +454,7 @@ insert into itu_codes values (acs_object_id_seq.nextval,'385','Croatia (Republic of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'386','Slovenia (Republic of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'387','Bosnia and Herzegovina',null); -insert into itu_codes values (acs_object_id_seq.nextval,'388','Group of countries,shared code'); +insert into itu_codes values (acs_object_id_seq.nextval,'388','Group of countries,shared code',null); insert into itu_codes values (acs_object_id_seq.nextval,'389','The Former Yugoslav Republic of Macedonia',null); insert into itu_codes values (acs_object_id_seq.nextval,'39','Italy',null); insert into itu_codes values (acs_object_id_seq.nextval,'39','Vatican City State',null); @@ -572,8 +572,8 @@ insert into itu_codes values (acs_object_id_seq.nextval,'84','Viet Nam (Socialist Republic of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'850','Democratic People''s Republic of Korea',null); insert into itu_codes values (acs_object_id_seq.nextval,'851','Spare code',null); -insert into itu_codes values (acs_object_id_seq.nextval,'852','Hongkong,China'); -insert into itu_codes values (acs_object_id_seq.nextval,'853','Macao,China'); +insert into itu_codes values (acs_object_id_seq.nextval,'852','Hongkong,China',null); +insert into itu_codes values (acs_object_id_seq.nextval,'853','Macao,China',null); insert into itu_codes values (acs_object_id_seq.nextval,'854','Spare code',null); insert into itu_codes values (acs_object_id_seq.nextval,'855','Cambodia (Kingdom of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'856','Lao People''s Democratic Republic',null); @@ -592,8 +592,8 @@ insert into itu_codes values (acs_object_id_seq.nextval,'878','Reserved ? Universal Personal Telecommunication Service (UPT)','e'); insert into itu_codes values (acs_object_id_seq.nextval,'879','Reserved for national non-commercial purposes',null); insert into itu_codes values (acs_object_id_seq.nextval,'880','Bangladesh (People''s Republic of)',null); -insert into itu_codes values (acs_object_id_seq.nextval,'881','Global Mobile Satellite System (GMSS),shared code'); -insert into itu_codes values (acs_object_id_seq.nextval,'882','International Networks,shared code'); +insert into itu_codes values (acs_object_id_seq.nextval,'881','Global Mobile Satellite System (GMSS),shared code',null); +insert into itu_codes values (acs_object_id_seq.nextval,'882','International Networks,shared code',null); insert into itu_codes values (acs_object_id_seq.nextval,'883','Spare code',null); insert into itu_codes values (acs_object_id_seq.nextval,'884','Spare code',null); insert into itu_codes values (acs_object_id_seq.nextval,'885','Spare code',null); @@ -640,7 +640,7 @@ insert into itu_codes values (acs_object_id_seq.nextval,'979','International Premium Rate Service (IPRS)',null); insert into itu_codes values (acs_object_id_seq.nextval,'98','Iran (Islamic Republic of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'990','Spare code',null); -insert into itu_codes values (acs_object_id_seq.nextval,'991','Trial of a proposed new international telecommunication public correspondence service,shared code'); +insert into itu_codes values (acs_object_id_seq.nextval,'991','Trial of a proposed new international telecommunication public correspondence service,shared code',null); insert into itu_codes values (acs_object_id_seq.nextval,'992','Tajikistan (Republic of)',null); insert into itu_codes values (acs_object_id_seq.nextval,'993','Turkmenistan',null); insert into itu_codes values (acs_object_id_seq.nextval,'994','Azerbaijani Republic',null); Index: openacs-4/packages/ref-itu/sql/oracle/ref-itu-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-itu/sql/oracle/ref-itu-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-itu/sql/oracle/ref-itu-create.sql 4 Mar 2003 22:47:02 -0000 1.2 +++ openacs-4/packages/ref-itu/sql/oracle/ref-itu-create.sql 30 Sep 2003 12:10:10 -0000 1.3 @@ -8,7 +8,7 @@ note_id char(3) constraint itu_notes_id_pk primary key, - note text + note varchar(1024) constraint itu_notes_note_nn not null constraint itu_notes_note_uq Index: openacs-4/packages/ref-itu/sql/oracle/ref-itu-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-itu/sql/oracle/ref-itu-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-itu/sql/oracle/ref-itu-drop.sql 4 Mar 2003 22:47:22 -0000 1.2 +++ openacs-4/packages/ref-itu/sql/oracle/ref-itu-drop.sql 30 Sep 2003 12:10:10 -0000 1.3 @@ -26,7 +26,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-language/sql/oracle/ref-language-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-language/sql/oracle/ref-language-drop.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ref-language/sql/oracle/ref-language-drop.sql 27 Aug 2001 05:40:11 -0000 1.3 +++ openacs-4/packages/ref-language/sql/oracle/ref-language-drop.sql 30 Sep 2003 12:10:10 -0000 1.4 @@ -26,7 +26,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-create.sql 16 Jul 2003 00:47:49 -0000 1.4 +++ openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-create.sql 30 Sep 2003 12:10:10 -0000 1.5 @@ -96,7 +96,7 @@ gmt_offset in timezones.gmt_offset%type ); - procedure delete ( + procedure del ( tz_id in timezones.tz_id%TYPE ); @@ -199,7 +199,7 @@ (timezone_seq.nextval, tz, gmt_offset); end; - procedure delete ( + procedure del ( tz_id in timezones.tz_id%TYPE ) is Index: openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-drop.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-drop.sql 15 Oct 2001 19:33:38 -0000 1.2 +++ openacs-4/packages/ref-timezones/sql/oracle/ref-timezones-drop.sql 30 Sep 2003 12:10:10 -0000 1.3 @@ -13,7 +13,7 @@ from acs_reference_repositories where lower(table_name) = 'timezones'; - acs_reference.delete(v_repository_id); + acs_reference.del(v_repository_id); end; / show errors; Index: openacs-4/packages/ref-us-counties/sql/oracle/ref-us-counties-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-counties/sql/oracle/ref-us-counties-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ref-us-counties/sql/oracle/ref-us-counties-drop.sql 27 Aug 2001 23:08:35 -0000 1.1 +++ openacs-4/packages/ref-us-counties/sql/oracle/ref-us-counties-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -26,7 +26,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-us-states/sql/oracle/ref-us-states-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-states/sql/oracle/ref-us-states-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ref-us-states/sql/oracle/ref-us-states-drop.sql 27 Aug 2001 22:56:54 -0000 1.1 +++ openacs-4/packages/ref-us-states/sql/oracle/ref-us-states-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -26,7 +26,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/ref-us-zipcodes/sql/oracle/ref-us-zipcodes-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-zipcodes/sql/oracle/ref-us-zipcodes-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ref-us-zipcodes/sql/oracle/ref-us-zipcodes-drop.sql 27 Aug 2001 23:23:14 -0000 1.1 +++ openacs-4/packages/ref-us-zipcodes/sql/oracle/ref-us-zipcodes-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -26,7 +26,7 @@ if rec.package_name is not null then execute immediate 'drop package ' || rec.package_name; end if; - acs_reference.delete(rec.repository_id); + acs_reference.del(rec.repository_id); end loop; end; / Index: openacs-4/packages/rss-support/sql/oracle/rss-generation-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/sql/oracle/rss-generation-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/rss-support/sql/oracle/rss-generation-create.sql 30 Oct 2002 16:07:31 -0000 1.1 +++ openacs-4/packages/rss-support/sql/oracle/rss-generation-create.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -129,7 +129,7 @@ p_subscr_id in rss_gen_subscrs.subscr_id%TYPE ) return varchar2; - function delete ( + function del ( p_subscr_id in rss_gen_subscrs.subscr_id%TYPE ) return number; @@ -179,7 +179,7 @@ return 'RSS Generation Subscription #'||p_subscr_id; end name; - function delete ( + function del ( p_subscr_id in rss_gen_subscrs.subscr_id%TYPE ) return number is @@ -188,11 +188,11 @@ delete from rss_gen_subscrs where subscr_id = p_subscr_id; - acs_object.delete(p_subscr_id); + acs_object.del(p_subscr_id); return 0; - end delete; + end del; end rss_gen_subscr; / -show errors \ No newline at end of file +show errors Index: openacs-4/packages/rss-support/sql/oracle/rss-generation-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/sql/oracle/rss-generation-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/rss-support/sql/oracle/rss-generation-drop.sql 30 Oct 2002 16:07:31 -0000 1.1 +++ openacs-4/packages/rss-support/sql/oracle/rss-generation-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -5,7 +5,7 @@ select MAX(subscr_id) into v_result from rss_gen_subscrs; While (v_result > 0) loop - v_delete := rss_gen_subscr.delete( + v_delete := rss_gen_subscr.del( p_subscr_id => v_result ); select MAX(subscr_id) into v_result from rss_gen_subscrs; @@ -18,4 +18,4 @@ show errors drop table rss_gen_subscrs; -drop package rss_gen_subscr; \ No newline at end of file +drop package rss_gen_subscr; Index: openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-drop.sql 30 Oct 2002 16:07:31 -0000 1.1 +++ openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -1,20 +1,20 @@ declare begin - acs_sc_operation.delete(contract_name => 'RssGenerationSubscriber',operation_name => 'Datasource'); + acs_sc_operation.del(contract_name => 'RssGenerationSubscriber',operation_name => 'Datasource'); - acs_sc_msg_type.delete(msg_type_name => 'RssGenerationSubscriber.Datasource.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'RssGenerationSubscriber.Datasource.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'RssGenerationSubscriber.Datasource.InputType'); + acs_sc_msg_type.del(msg_type_name => 'RssGenerationSubscriber.Datasource.OutputType'); - acs_sc_operation.delete(contract_name => 'RssGenerationSubscriber',operation_name => 'LastUpdated'); + acs_sc_operation.del(contract_name => 'RssGenerationSubscriber',operation_name => 'LastUpdated'); - acs_sc_msg_type.delete(msg_type_name => 'RssGenerationSubscriber.LastUpdated.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'RssGenerationSubscriber.LastUpdated.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'RssGenerationSubscriber.LastUpdated.InputType'); + acs_sc_msg_type.del(msg_type_name => 'RssGenerationSubscriber.LastUpdated.OutputType'); - acs_sc_contract.delete(contract_name => 'RssGenerationSubscriber'); + acs_sc_contract.del(contract_name => 'RssGenerationSubscriber'); end; / show errors -delete from acs_sc_bindings where contract_id = acs_sc_contract.get_id('RssGenerationSubscriber'); \ No newline at end of file +delete from acs_sc_bindings where contract_id = acs_sc_contract.get_id('RssGenerationSubscriber'); Index: openacs-4/packages/rss-support/www/delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete-2-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/rss-support/www/delete-2-oracle.xql 17 May 2003 11:23:28 -0000 1.2 +++ openacs-4/packages/rss-support/www/delete-2-oracle.xql 30 Sep 2003 12:10:10 -0000 1.3 @@ -6,7 +6,7 @@ begin - :1 := rss_gen_subscr.delete (:subscr_id); + :1 := rss_gen_subscr.del (:subscr_id); end; Index: openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-create.sql 5 Jun 2002 02:32:58 -0000 1.1 +++ openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-create.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -6,6 +6,7 @@ foo := acs_sc_impl.new( 'PaymentGateway', -- impl_contract_name 'sample-gateway', -- impl_name + 'sample-gateway', -- impl_pretty_name 'sample-gateway' -- impl_owner_name ); Index: openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-drop.sql 5 Jun 2002 02:32:58 -0000 1.1 +++ openacs-4/packages/sample-gateway/sql/oracle/sample-gateway-sc-drop.sql 30 Sep 2003 12:10:10 -0000 1.2 @@ -31,12 +31,12 @@ 'info' ); - acs_sc_binding.delete( + acs_sc_binding.del( contract_name => 'PaymentGateway', impl_name => 'sample-gateway' ); - acs_sc_impl.delete( + acs_sc_impl.del( 'PaymentGateway', 'sample-gateway' ); Index: openacs-4/packages/search/sql/oracle/search-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/oracle/search-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/search/sql/oracle/search-sc-drop.sql 2 Jul 2002 01:52:38 -0000 1.1 +++ openacs-4/packages/search/sql/oracle/search-sc-drop.sql 30 Sep 2003 12:10:11 -0000 1.2 @@ -1,25 +1,25 @@ declare begin - acs_sc_contract.delete(contract_name => 'FtsContentProvider'); - acs_sc_msg_type.delete(msg_type_name => 'FtsContentProvider.Datasource.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsContentProvider.Datasource.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsContentProvider.Url.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsContentProvider.Url.OutputType'); + acs_sc_contract.del(contract_name => 'FtsContentProvider'); + acs_sc_msg_type.del(msg_type_name => 'FtsContentProvider.Datasource.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsContentProvider.Datasource.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsContentProvider.Url.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsContentProvider.Url.OutputType'); - acs_sc_contract.delete(contract_name => 'FtsEngineDriver'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Search.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Search.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Index.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Index.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Unindex.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Unindex.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.UpdateIndex.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.UpdateIndex.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Summary.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Summary.OutputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Info.InputType'); - acs_sc_msg_type.delete(msg_type_name => 'FtsEngineDriver.Info.OutputType'); + acs_sc_contract.del(contract_name => 'FtsEngineDriver'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Search.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Search.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Index.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Index.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Unindex.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Unindex.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.UpdateIndex.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.UpdateIndex.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Summary.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Summary.OutputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Info.InputType'); + acs_sc_msg_type.del(msg_type_name => 'FtsEngineDriver.Info.OutputType'); end; / Index: openacs-4/packages/shipping-gateway/sql/oracle/shipping-gateway-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/sql/oracle/shipping-gateway-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/shipping-gateway/sql/oracle/shipping-gateway-sc-drop.sql 21 May 2002 18:34:38 -0000 1.1 +++ openacs-4/packages/shipping-gateway/sql/oracle/shipping-gateway-sc-drop.sql 30 Sep 2003 12:10:11 -0000 1.2 @@ -1,11 +1,11 @@ begin - acs_sc_operation.delete('ShippingGateway','RatesAndServicesSelection'); - acs_sc_msg_type.delete('ShippingGateway.RatesAndServicesSelection.InputType'); - acs_sc_msg_type.delete('ShippingGateway.RatesAndServicesSelection.OutputType'); - acs_sc_operation.delete('ShippingGateway','ServiceDescription'); - acs_sc_msg_type.delete('ShippingGateway.ServiceDescription.InputType'); - acs_sc_msg_type.delete('ShippingGateway.ServiceDescription.OutputType'); - acs_sc_contract.delete('ShippingGateway'); + acs_sc_operation.del('ShippingGateway','RatesAndServicesSelection'); + acs_sc_msg_type.del('ShippingGateway.RatesAndServicesSelection.InputType'); + acs_sc_msg_type.del('ShippingGateway.RatesAndServicesSelection.OutputType'); + acs_sc_operation.del('ShippingGateway','ServiceDescription'); + acs_sc_msg_type.del('ShippingGateway.ServiceDescription.InputType'); + acs_sc_msg_type.del('ShippingGateway.ServiceDescription.OutputType'); + acs_sc_contract.del('ShippingGateway'); end; / show errors Index: openacs-4/packages/simple-survey/sql/oracle/simple-survey-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/sql/oracle/simple-survey-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/sql/oracle/simple-survey-package-create.sql 10 May 2002 00:47:04 -0000 1.3 +++ openacs-4/packages/simple-survey/sql/oracle/simple-survey-package-create.sql 30 Sep 2003 12:10:11 -0000 1.4 @@ -19,7 +19,7 @@ context_id in acs_objects.context_id%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( survey_id in survsimp_surveys.survey_id%TYPE ); end survsimp_survey; @@ -67,15 +67,15 @@ return v_survey_id; end new; - procedure delete ( + procedure del ( survey_id survsimp_surveys.survey_id%TYPE ) is begin delete from survsimp_surveys - where survey_id = survsimp_survey.delete.survey_id; - acs_object.delete(survey_id); - end delete; + where survey_id = survsimp_survey.del.survey_id; + acs_object.del(survey_id); + end del; end survsimp_survey; / show errors @@ -103,7 +103,7 @@ context_id in acs_objects.context_id%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( question_id in survsimp_questions.question_id%TYPE ); end survsimp_question; @@ -151,15 +151,15 @@ return v_question_id; end new; - procedure delete ( + procedure del ( question_id in survsimp_questions.question_id%TYPE ) is begin delete from survsimp_questions - where question_id = survsimp_question.delete.question_id; - acs_object.delete(question_id); - end delete; + where question_id = survsimp_question.del.question_id; + acs_object.del(question_id); + end del; end survsimp_question; / show errors @@ -181,7 +181,7 @@ context_id in acs_objects.context_id%TYPE default null ) return acs_objects.object_id%TYPE; - procedure delete ( + procedure del ( response_id in survsimp_responses.response_id%TYPE ); end survsimp_response; @@ -218,15 +218,15 @@ return v_response_id; end new; - procedure delete ( + procedure del ( response_id in survsimp_responses.response_id%TYPE ) is begin delete from survsimp_responses - where response_id = survsimp_response.delete.response_id; - acs_object.delete(response_id); - end delete; + where response_id = survsimp_response.del.response_id; + acs_object.del(response_id); + end del; end survsimp_response; / show errors Index: openacs-4/packages/simple-survey/www/admin/question-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-delete-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/question-delete-oracle.xql 15 Jun 2001 01:06:39 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/question-delete-oracle.xql 30 Sep 2003 12:10:11 -0000 1.2 @@ -7,7 +7,7 @@ begin - survsimp_question.delete (:question_id); + survsimp_question.del (:question_id); end; Index: openacs-4/packages/spam/sql/oracle/spam-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/spam/sql/oracle/spam-packages.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/spam/sql/oracle/spam-packages.sql 4 Sep 2001 21:14:59 -0000 1.2 +++ openacs-4/packages/spam/sql/oracle/spam-packages.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -222,13 +222,13 @@ -- elegant way to do this though. (TilmannS) update acs_mail_multipart_parts set content_item_id=null where multipart_id=v_content_obj; - content_item.delete(v_parts_row.content_item_id); + content_item.del(v_parts_row.content_item_id); end loop; - acs_mail_multipart.delete(v_content_obj); + acs_mail_multipart.del(v_content_obj); else - content_item.delete(v_content_obj); + content_item.del(v_content_obj); end if; if plain_text is not null then @@ -290,7 +290,7 @@ creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null, - object_type in acs_objects.object_type%TYPE default null, + object_type in acs_objects.object_type%TYPE default 'acs_content', mime_type in cr_revisions.mime_type%TYPE default 'text/plain', p_text in varchar2 default null, p_body_id in acs_mail_bodies.body_id%TYPE Index: openacs-4/packages/static-pages/sql/oracle/static-page-pb.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/sql/oracle/static-page-pb.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/static-pages/sql/oracle/static-page-pb.sql 16 Jan 2003 13:59:05 -0000 1.2 +++ openacs-4/packages/static-pages/sql/oracle/static-page-pb.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -76,7 +76,7 @@ return v_item_id; end; - procedure delete ( + procedure del ( static_page_id in static_pages.static_page_id%TYPE ) is begin @@ -97,14 +97,14 @@ where parent_id = comment_row.comment_id ); - acs_message.delete(comment_row.comment_id); + acs_message.del(comment_row.comment_id); end loop; -- Delete the page. -- WE SHOULDN'T NEED TO DO THIS: CONTENT_ITEM.DELETE SHOULD TAKE CARE OF -- DELETING FROM STATIC PAGES. - delete from static_pages where static_page_id = static_page.delete.static_page_id; - content_item.delete(static_page_id); + delete from static_pages where static_page_id = static_page.del.static_page_id; + content_item.del(static_page_id); end; function get_root_folder ( @@ -252,11 +252,11 @@ select static_page_id from static_pages where folder_id = folder_row.folder_id ) loop - static_page.delete(page_row.static_page_id); + static_page.del(page_row.static_page_id); end loop; delete from sp_folders where folder_id = folder_row.folder_id; - content_folder.delete(folder_row.folder_id); + content_folder.del(folder_row.folder_id); end loop; end; @@ -283,7 +283,7 @@ where session_id = static_page.delete_stale_items.session_id ) ) loop - static_page.delete(stale_file_row.static_page_id); + static_page.del(stale_file_row.static_page_id); end loop; -- Now delete all folders that aren't in sp_extant_folders. There are two @@ -314,7 +314,7 @@ delete from sp_folders where folder_id = stale_folder_row.folder_id; - content_folder.delete(stale_folder_row.folder_id); + content_folder.del(stale_folder_row.folder_id); end loop; end delete_stale_items; Index: openacs-4/packages/static-pages/sql/oracle/static-page-ph.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/sql/oracle/static-page-ph.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/static-pages/sql/oracle/static-page-ph.sql 16 Jan 2003 13:59:05 -0000 1.2 +++ openacs-4/packages/static-pages/sql/oracle/static-page-ph.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -31,7 +31,7 @@ ,mime_type in cr_revisions.mime_type%TYPE default 'text/html' ) return static_pages.static_page_id%TYPE; - procedure delete ( + procedure del ( -- /** -- * Delete a static page, including the associated content_item. -- * Index: openacs-4/packages/static-pages/sql/oracle/static-pages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/sql/oracle/static-pages-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/static-pages/sql/oracle/static-pages-create.sql 16 Jan 2003 13:59:05 -0000 1.2 +++ openacs-4/packages/static-pages/sql/oracle/static-pages-create.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -176,7 +176,7 @@ ); end; / -show errros +show errors @static-page-ph.sql Index: openacs-4/packages/survey/sql/oracle/survey-notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/sql/oracle/survey-notifications-init.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/survey/sql/oracle/survey-notifications-init.sql 17 Sep 2003 13:58:47 -0000 1.2 +++ openacs-4/packages/survey/sql/oracle/survey-notifications-init.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -13,6 +13,7 @@ impl_id := acs_sc_impl.new ( impl_contract_name => 'NotificationType', impl_name => 'survey_response_notif_type', + impl_pretty_name => 'Survey Responce Notification', impl_owner_name => 'survey' ); Index: openacs-4/packages/survey/sql/oracle/survey-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/sql/oracle/survey-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/survey/sql/oracle/survey-package-create.sql 12 Jun 2003 03:54:46 -0000 1.2 +++ openacs-4/packages/survey/sql/oracle/survey-package-create.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -202,7 +202,7 @@ end loop; delete from surveys where survey_id=remove.survey_id; - acs_object.delete(survey_id); + acs_object.del(survey_id); end remove; function name ( @@ -268,7 +268,7 @@ survey_question.remove(v_question_row.question_id); end loop; delete from survey_sections where section_id=remove.section_id; - acs_object.delete(remove.section_id); + acs_object.del(remove.section_id); end remove; end survey_section; / @@ -328,7 +328,7 @@ where question_id=remove.question_id; delete from survey_questions where question_id = remove.question_id; - acs_object.delete(remove.question_id); + acs_object.del(remove.question_id); end remove; end survey_question; / @@ -420,14 +420,14 @@ where response_id=del.response_id and attachment_answer=revision_id) loop - content_item.delete(v_question_response_row.item_id); + content_item.del(v_question_response_row.item_id); end loop; delete from survey_question_responses where response_id=del.response_id; delete from survey_responses where response_id=del.response_id; - acs_object.delete(del.response_id); + acs_object.del(del.response_id); end del; function boolean_answer ( Index: openacs-4/packages/user-preferences/sql/oracle/user-preferences-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/user-preferences/sql/oracle/user-preferences-package-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/user-preferences/sql/oracle/user-preferences-package-create.sql 9 Aug 2002 20:51:50 -0000 1.2 +++ openacs-4/packages/user-preferences/sql/oracle/user-preferences-package-create.sql 30 Sep 2003 12:10:11 -0000 1.3 @@ -48,7 +48,7 @@ value in user_preference_default_values.default_value%TYPE ); - procedure delete ( + procedure del ( preference_type_id in user_preference_types.preference_type_id%TYPE ); end user_pref_type; @@ -189,13 +189,13 @@ end set_user_pref; - procedure delete ( + procedure del ( preference_type_id in user_preference_types.preference_type_id%TYPE ) is begin - acs_object.delete(preference_type_id); - end delete; + acs_object.del(preference_type_id); + end del; end user_pref_type; / Index: openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-create.sql 13 Sep 2002 02:11:10 -0000 1.1 +++ openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-create.sql 30 Sep 2003 12:10:11 -0000 1.2 @@ -6,6 +6,7 @@ foo := acs_sc_impl.new( 'ShippingGateway', -- impl_contract_name 'value-based-shipping', -- impl_name + 'Value Based Shipping', -- impl_pretty_name 'value-based-shipping' -- impl_owner_name ); Index: openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-drop.sql 13 Sep 2002 02:11:10 -0000 1.1 +++ openacs-4/packages/value-based-shipping/sql/oracle/value-based-shipping-sc-drop.sql 30 Sep 2003 12:10:11 -0000 1.2 @@ -13,12 +13,12 @@ 'ServiceDescription' ); - acs_sc_binding.delete( + acs_sc_binding.del( contract_name => 'ShippingGateway', impl_name => 'value-based-shipping' ); - acs_sc_impl.delete( + acs_sc_impl.del( 'ShippingGateway', 'value-based-shipping' ); Index: openacs-4/packages/workflow/sql/oracle/workflow-data-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-data-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/workflow/sql/oracle/workflow-data-drop.sql 5 Mar 2003 17:17:18 -0000 1.1 +++ openacs-4/packages/workflow/sql/oracle/workflow-data-drop.sql 30 Sep 2003 12:10:11 -0000 1.2 @@ -5,7 +5,7 @@ begin for row in (select workflow_id from workflows) loop - foo := workflow.delete(row.workflow_id); + foo := workflow.del(row.workflow_id); end loop; end; / Index: openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql 28 Aug 2003 09:41:59 -0000 1.3 +++ openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql 30 Sep 2003 12:10:11 -0000 1.4 @@ -17,7 +17,7 @@ object_id in integer ) return varchar; - function delete( + function del( delete_case_id in integer ) return integer; @@ -53,7 +53,7 @@ end get_pretty_state; - function delete( + function del( delete_case_id in integer ) return integer is @@ -64,15 +64,15 @@ and wcl.case_id = delete_case_id) loop delete from workflow_case_log where entry_id = rec.item_id; - content_item.delete(rec.item_id); + content_item.del(rec.item_id); end loop; -- All workflow data cascades from the case id delete from workflow_cases where object_id = delete_case_id; return 0; - end delete; + end del; end workflow_case_pkg; / @@ -81,7 +81,7 @@ create or replace package workflow as - function delete( + function del( delete_workflow_id in integer ) return integer; @@ -103,7 +103,7 @@ create or replace package body workflow as - function delete( + function del( delete_workflow_id in integer ) return integer is @@ -114,13 +114,13 @@ from workflow_cases where workflow_id = delete_workflow_id) loop - foo := workflow_case_pkg.delete(rec.case_id); + foo := workflow_case_pkg.del(rec.case_id); end loop; - acs_object.delete(delete_workflow_id); + acs_object.del(delete_workflow_id); return 0; - end delete; + end del; -- Function for creating a workflow Index: openacs-4/packages/workflow/sql/oracle/workflow-tables-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-tables-drop.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/workflow/sql/oracle/workflow-tables-drop.sql 1 Sep 2003 13:43:51 -0000 1.3 +++ openacs-4/packages/workflow/sql/oracle/workflow-tables-drop.sql 30 Sep 2003 12:10:11 -0000 1.4 @@ -13,7 +13,7 @@ begin for row in (select workflow_id from workflows) loop - foo := workflow.delete(row.workflow_id); + foo := workflow.del(row.workflow_id); end loop; acs_object_type.drop_type('workflow_lite', 't'); Index: openacs-4/packages/workflow/tcl/case-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/workflow/tcl/case-procs-oracle.xql 28 Aug 2003 09:41:59 -0000 1.3 +++ openacs-4/packages/workflow/tcl/case-procs-oracle.xql 30 Sep 2003 12:10:12 -0000 1.4 @@ -96,7 +96,7 @@ begin - :1 := workflow_case.delete(:case_id); + :1 := workflow_case.del(:case_id); end; Index: openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql 5 Mar 2003 17:18:10 -0000 1.2 +++ openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql 30 Sep 2003 12:10:12 -0000 1.3 @@ -22,7 +22,7 @@ begin - :1 := workflow.delete(:workflow_id); + :1 := workflow.del(:workflow_id); end; Index: openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql 28 Aug 2003 09:41:59 -0000 1.5 +++ openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql 30 Sep 2003 12:10:12 -0000 1.6 @@ -619,7 +619,7 @@ background_item_id in cr_items.item_id%TYPE ); - procedure delete ( + procedure del ( pres_item_id in cr_items.item_id%TYPE ); @@ -695,7 +695,7 @@ bullet_items_item_id in cr_items.item_id%TYPE ); - procedure delete ( + procedure del ( slide_item_id in cr_items.item_id%TYPE ); @@ -748,7 +748,7 @@ create or replace package wp_attachment as - procedure delete ( + procedure del ( attach_item_id in cr_items.item_id%TYPE ); @@ -916,7 +916,7 @@ delete from cr_item_publish_audit where item_id = audience_item_id; - content_item.delete(audience_item_id); + content_item.del(audience_item_id); end; procedure delete_background ( @@ -930,10 +930,10 @@ delete from cr_item_publish_audit where item_id = background_item_id; - content_item.delete(background_item_id); + content_item.del(background_item_id); end; - procedure delete ( + procedure del ( pres_item_id in cr_items.item_id%TYPE ) is @@ -946,7 +946,7 @@ and parent_id = pres_item_id; begin for c in v_slide_cursor loop - wp_slide.delete(c.slide_item_id); + wp_slide.del(c.slide_item_id); end loop; select item_id into v_audience_item_id @@ -966,7 +966,7 @@ delete from acs_permissions where object_id = pres_item_id; update acs_objects set context_id=null where context_id = pres_item_id; delete from cr_wp_presentations where exists (select 1 from cr_revisions where cr_revisions.revision_id = cr_wp_presentations.presentation_id and cr_revisions.item_id = pres_item_id); - content_item.delete(pres_item_id); + content_item.del(pres_item_id); end; function get_audience ( @@ -1338,7 +1338,7 @@ delete from cr_item_publish_audit where item_id = preamble_item_id; - content_item.delete(preamble_item_id); + content_item.del(preamble_item_id); end; procedure delete_postamble ( @@ -1352,7 +1352,7 @@ delete from cr_item_publish_audit where item_id = postamble_item_id; - content_item.delete(postamble_item_id); + content_item.del(postamble_item_id); end; procedure delete_bullet_items ( @@ -1366,10 +1366,10 @@ delete from cr_item_publish_audit where item_id = bullet_items_item_id; - content_item.delete(bullet_items_item_id); + content_item.del(bullet_items_item_id); end; - procedure delete ( + procedure del ( slide_item_id in cr_items.item_id%TYPE ) is @@ -1385,7 +1385,7 @@ and parent_id = slide_item_id; begin for c in v_attach_cursor loop - wp_attachment.delete(c.attach_item_id); + wp_attachment.del(c.attach_item_id); end loop; select item_id into v_preamble_item_id @@ -1419,7 +1419,7 @@ update cr_wp_slides set sort_key = sort_key - 1 where sort_key > v_sort_key and exists (select 1 from cr_revisions r, cr_items i where i.parent_id = v_pres_item_id and i.item_id = r.item_id and r.revision_id = cr_wp_slides.slide_id); update acs_objects set context_id=null where context_id = slide_item_id; delete from cr_item_publish_audit where item_id = slide_item_id; - content_item.delete(slide_item_id); + content_item.del(slide_item_id); end; function get_preamble ( @@ -1654,7 +1654,7 @@ create or replace package body wp_attachment as - procedure delete ( + procedure del ( attach_item_id in cr_items.item_id%TYPE ) is @@ -1668,7 +1668,7 @@ delete from cr_item_publish_audit where item_id = attach_item_id; - content_item.delete(attach_item_id); + content_item.del(attach_item_id); end; procedure new_revision ( @@ -1704,7 +1704,7 @@ create or replace package wp_style as -procedure delete ( +procedure del ( p_style_id in wp_styles.style_id%TYPE ); @@ -1721,7 +1721,7 @@ create or replace package body wp_style as -procedure delete ( +procedure del ( p_style_id in wp_styles.style_id%TYPE ) is @@ -1730,17 +1730,17 @@ for one_image in ( select * from wp_style_images - where wp_style_images_id = (select background_image from wp_styles where style_id = wp_style.delete.p_style_id)) + where wp_style_images_id = (select background_image from wp_styles where style_id = wp_style.del.p_style_id)) loop delete from wp_style_images where wp_style_images_id = one_image.wp_style_images_id; select item_id into p_item_id from cr_revisions where revision_id = one_image.wp_style_images_id; - content_item.delete(item_id => p_item_id); + content_item.del(item_id => p_item_id); end loop; - update cr_wp_slides set style = -1 where style = wp_style.delete.p_style_id; - update cr_wp_presentations set style = -1 where style = wp_style.delete.p_style_id; - delete from wp_styles where style_id = wp_style.delete.p_style_id; + update cr_wp_slides set style = -1 where style = wp_style.del.p_style_id; + update cr_wp_presentations set style = -1 where style = wp_style.del.p_style_id; + delete from wp_styles where style_id = wp_style.del.p_style_id; end; @@ -1760,7 +1760,7 @@ select item_id into p_item_id from cr_revisions where revision_id = wp_style.image_delete.p_revision_id; - content_item.delete(item_id => p_item_id); + content_item.del(item_id => p_item_id); end; Index: openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql 28 Aug 2003 09:41:59 -0000 1.4 +++ openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql 30 Sep 2003 12:10:12 -0000 1.5 @@ -21,7 +21,7 @@ begin for c in v_attach_cursor loop - content_item.delete(c.item_id); + content_item.del(c.item_id); end loop; end; @@ -88,19 +88,19 @@ begin for c in v_slide_clob_cursor loop - content_item.delete(c.item_id); + content_item.del(c.item_id); end loop; for c in v_slide_cursor loop - content_item.delete(c.item_id); + content_item.del(c.item_id); end loop; for c in v_pres_clob_cursor loop - content_item.delete(c.item_id); + content_item.del(c.item_id); end loop; for c in v_pres_cursor loop - content_item.delete(c.item_id); + content_item.del(c.item_id); end loop; end; Index: openacs-4/packages/wp-slim/www/attach-del-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-del-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/attach-del-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/attach-del-oracle.xql 30 Sep 2003 12:10:12 -0000 1.2 @@ -7,7 +7,7 @@ begin - wp_attachment.delete(:attach_item_id); + wp_attachment.del(:attach_item_id); end; Index: openacs-4/packages/wp-slim/www/attach-del.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-del.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/attach-del.tcl 22 Sep 2003 18:41:27 -0000 1.4 +++ openacs-4/packages/wp-slim/www/attach-del.tcl 30 Sep 2003 12:10:12 -0000 1.5 @@ -20,7 +20,7 @@ db_exec_plsql revisions_and_item_delete { begin - wp_attachment.delete(:attach_item_id); + wp_attachment.del(:attach_item_id); end; } Index: openacs-4/packages/wp-slim/www/delete-presentation-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/delete-presentation-2-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/delete-presentation-2-oracle.xql 30 Sep 2003 12:10:12 -0000 1.2 @@ -7,7 +7,7 @@ begin - wp_presentation.delete(:pres_item_id); + wp_presentation.del(:pres_item_id); end; Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 22 Sep 2003 18:41:27 -0000 1.4 +++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 30 Sep 2003 12:10:12 -0000 1.5 @@ -19,7 +19,7 @@ if { [ad_check_password $user_id $password] } { db_exec_plsql delete_presentation { begin - wp_presentation.delete(:pres_item_id); + wp_presentation.del(:pres_item_id); end; } } else { Index: openacs-4/packages/wp-slim/www/delete-slide-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide-2-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/delete-slide-2-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/delete-slide-2-oracle.xql 30 Sep 2003 12:10:12 -0000 1.2 @@ -7,7 +7,7 @@ begin - wp_slide.delete(:slide_item_id); + wp_slide.del(:slide_item_id); end; Index: openacs-4/packages/wp-slim/www/delete-slide-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/delete-slide-2.tcl 22 Sep 2003 18:41:27 -0000 1.4 +++ openacs-4/packages/wp-slim/www/delete-slide-2.tcl 30 Sep 2003 12:10:12 -0000 1.5 @@ -19,7 +19,7 @@ db_exec_plsql delete_slide { begin - wp_slide.delete(:slide_item_id); + wp_slide.del(:slide_item_id); end; } Index: openacs-4/packages/wp-slim/www/style-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-delete-2-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/style-delete-2-oracle.xql 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/www/style-delete-2-oracle.xql 30 Sep 2003 12:10:12 -0000 1.3 @@ -7,7 +7,7 @@ begin - wp_style.delete( p_style_id => :style_id ); + wp_style.del( p_style_id => :style_id ); end; Index: openacs-4/www/default-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v diff -u -N -r1.16 -r1.17 --- openacs-4/www/default-master.adp 15 Sep 2003 05:59:37 -0000 1.16 +++ openacs-4/www/default-master.adp 30 Sep 2003 12:10:12 -0000 1.17 @@ -1,24 +1,21 @@ - + @title;noquote@ @header_stuff;noquote@ @focus;noquote@ @doc_type;noquote@ -
-
- -

@title@

-
-
- -
+ + + + +

@title;noquote@

+@context_bar;noquote@ +
+ + + + +
+
@signatory@