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 -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql 23 Jan 2004 04:29:14 -0000 1.4 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-extlink.sql 23 Jan 2004 05:14:19 -0000 1.5 @@ -104,7 +104,7 @@ extlink_id in cr_extlinks.extlink_id%TYPE, target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, name in cr_items.name%TYPE default null ) is v_current_folder_id cr_folders.folder_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 -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 23 Jan 2004 04:25:54 -0000 1.4 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 23 Jan 2004 05:14:19 -0000 1.5 @@ -85,7 +85,7 @@ procedure del ( folder_id in cr_folders.folder_id%TYPE, - cascade_p in varchar2(1) default 'f' + cascade_p in char default 'f' ) is v_count integer; @@ -113,9 +113,9 @@ else for v_child_item_id in c_folder_children_cur loop if content_folder.is_folder(v_child_item_id) then - perform content_folder.delete(v_child_item_id); + content_folder.delete(v_child_item_id); else - perform content_item.delete(v_child_item_id); + content_item.delete(v_child_item_id); end if; end loop; end if; @@ -298,10 +298,6 @@ where item_id = copy.folder_id; - if copy.name = '' then - copy.name := NULL; - end if; - if folder_id = content_item.get_root_folder or folder_id = content_template.get_root_folder or target_folder_id = folder_id then v_valid_folders_p := 0; end if; 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 -r1.3 -r1.4 --- openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql 23 Jan 2004 04:31:10 -0000 1.3 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-symlink.sql 23 Jan 2004 05:14:19 -0000 1.4 @@ -146,7 +146,7 @@ symlink_id in cr_symlinks.symlink_id%TYPE, target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, name in cr_items.name%TYPE default null ) is v_current_folder_id cr_folders.folder_id%TYPE; 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 -r1.13 -r1.14 --- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 23 Jan 2004 04:39:29 -0000 1.13 +++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 23 Jan 2004 05:14:19 -0000 1.14 @@ -637,7 +637,7 @@ --*/ item_id in cr_items.item_id%TYPE, target_folder_id in cr_folders.folder_id%TYPE, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ); procedure copy ( @@ -656,7 +656,7 @@ target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, creation_ip in acs_objects.creation_ip%TYPE default null, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ); function copy2 ( @@ -676,7 +676,7 @@ target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, creation_ip in acs_objects.creation_ip%TYPE default null, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ) return cr_items.item_id%TYPE; -- get the latest revision for an item @@ -1057,7 +1057,7 @@ target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, creation_ip in acs_objects.creation_ip%TYPE default null, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ); function is_symlink ( @@ -1158,7 +1158,7 @@ target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, creation_ip in acs_objects.creation_ip%TYPE default null, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ); end content_extlink; @@ -1200,7 +1200,7 @@ -- @see {acs_object.delete}, {content_item.delete} --*/ folder_id in cr_folders.folder_id%TYPE, - cascade_p in char(1) default 'f' + cascade_p in char default 'f' ); procedure rename ( @@ -1252,7 +1252,7 @@ target_folder_id in cr_folders.folder_id%TYPE, creation_user in acs_objects.creation_user%TYPE, creation_ip in acs_objects.creation_ip%TYPE default null, - name in cr_items.name%TYPE default NULL + name in cr_items.name%TYPE default null ); function is_folder (