Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 18 Apr 2001 23:27:46 -0000 1.11 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 19 Apr 2001 01:17:17 -0000 1.12 @@ -167,19 +167,20 @@ v_name_already_exists_p integer; begin - if rename__name is not null then + if rename__name is not null and rename__name != '''' then PERFORM content_item__rename(rename__folder_id, rename__name); end if; - if rename__label is not null and rename__description is not null then + if rename__label is not null and rename__label != '''' and + rename__description is not null and rename__description != '''' then update cr_folders set label = rename__label, description = rename__description where folder_id = rename__folder_id; - else if rename__label is not null and rename__description is null then - + else if(rename__label is not null and rename__label != '''') and + (rename__description is null or rename__description = '''') then update cr_folders set label = rename__label where folder_id = rename__folder_id; Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 18 Apr 2001 23:27:46 -0000 1.12 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 19 Apr 2001 01:17:17 -0000 1.13 @@ -183,7 +183,7 @@ v_parent_id ); - if new__relation_tag is null then + if new__relation_tag is null or new__relation_tag = '''' then v_rel_tag := content_item__get_content_type(v_parent_id) || ''-'' || new__content_type; else @@ -199,7 +199,7 @@ end if; -- use the name of the item if no title is supplied - if new__title is null then + if new__title is null or new__title = '''' then v_title := new__name; else v_title := new__title; @@ -225,8 +225,8 @@ new__creation_ip ); - else if new__title is not null or - new__text is not null then + else if (new__title is not null and new__title != '''') or + (new__text is not null and new__text != '''') then v_revision_id := content_revision__new( v_title, Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 18 Apr 2001 23:27:46 -0000 1.6 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 19 Apr 2001 01:17:17 -0000 1.7 @@ -56,7 +56,7 @@ -- PASSED ALL CHECKS -- -- Select default name if the name is null - if new__name is null then + if new__name is null or new__name = '''' then select ''symlink_to_'' || name into v_name from @@ -72,7 +72,7 @@ end if; -- Select default label if the label is null - if new__label is null then + if new__label is null or new__label = '''' then v_label := ''Symlink to '' || v_name; else v_label := new__label; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 17 Apr 2001 23:41:36 -0000 1.18 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 19 Apr 2001 01:17:17 -0000 1.19 @@ -753,7 +753,7 @@ and o1.tree_sortkey like (o2.tree_sortkey || ''%'') order by o2.tree_sortkey desc loop - if obj_type.name_method != '''' then + if obj_type.name_method != '''' and obj_type.name_method is NOT null then -- Execute the first name_method we find (since we''re traversing -- up the type hierarchy from the object''s exact type) using Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 17 Apr 2001 23:41:36 -0000 1.10 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 19 Apr 2001 01:17:17 -0000 1.11 @@ -2276,7 +2276,7 @@ apm_pkg_ver__data_model_loaded_p alias for $12; -- default ''f'' v_version_id apm_package_versions.version_id%TYPE; begin - if apm_pkg_ver__version_id='''' then + if apm_pkg_ver__version_id = '''' or apm_pkg_ver__version_id is null then select acs_object_id_seq.nextval into v_version_id from dual;