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.7 -r1.8 --- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 2 Mar 2004 17:01:47 -0000 1.7 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 4 Mar 2004 14:52:35 -0000 1.8 @@ -22,12 +22,10 @@ folder_id in cr_folders.folder_id%TYPE default null, 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, - package_id in acs_objects.package_id%TYPE default null, + creation_ip in acs_objects.creation_ip%TYPE default null ) return cr_folders.folder_id%TYPE is v_folder_id cr_folders.folder_id%TYPE; v_context_id acs_objects.context_id%TYPE; - v_package_id acs_objects.package_id%TYPE; begin -- set the context_id @@ -45,12 +43,6 @@ 'This folder does not allow subfolders to be created'); else - v_package_id := package_id; - - if parent_id is not null and package_id is null then - v_package_id := acs_object.package_id(content_item.get_root_folder(parent_id)); - end if; - v_folder_id := content_item.new( item_id => folder_id, name => name, @@ -60,21 +52,15 @@ creation_date => creation_date, creation_user => creation_user, creation_ip => creation_ip, - parent_id => parent_id, - package_id => v_package_id + parent_id => parent_id ); insert into cr_folders ( - folder_id, label, description, package_id + folder_id, label, description ) values ( - v_folder_id, label, description, v_package_id + v_folder_id, label, description ); - -- set the correct object title - update acs_objects - set title = new.label - where object_id = v_folder_id; - -- inherit the attributes of the parent folder if content_folder.new.parent_id is not null then @@ -177,12 +163,6 @@ content_item.rename(folder_id, name); end if; - if label is not null then - update acs_objects - set title = rename.label - where object_id = rename.folder_id; - end if; - if label is not null and description is not null then update cr_folders