Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql 20 Mar 2003 22:13:19 -0000 1.8.2.1 +++ openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql 21 Mar 2003 02:55:49 -0000 1.8.2.2 @@ -696,7 +696,9 @@ order by c1.tree_sortkey desc loop + -- DRB: Why can''t we just use object delete here? + -- We delete the item. On delete cascade should take care -- of deletion of revisions. if v_rec.content_type = ''file_storage_object'' @@ -712,8 +714,20 @@ PERFORM content_folder__delete(v_rec.item_id); end if; - -- We may have to delete other items here, e.g., symlinks (future feature) + -- Instead of doing an if-else, we make sure we are deleting a folder. + if v_rec.content_type = ''content_symlink'' + then + raise notice ''Deleting symlink_id = %'',v_rec.item_id; + PERFORM content_symlink__delete(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 + raise notice ''Deleting folder_id = %'',v_rec.item_id; + PERFORM content_extlink__delete(v_rec.item_id); + end if; + end loop; -- We need to return something for the trigger to be activated