Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql	5 Mar 2003 17:02:23 -0000	1.3
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql	15 Oct 2004 08:49:43 -0000	1.3.2.1
@@ -149,6 +149,9 @@
 -- change triggers to index only live revisions --DaveB 2002-09-26
 -- triggers queue search interface to modify search index after content
 -- changes.
+
+drop function content_search__itrg() cascade;
+
 create or replace function content_search__itrg ()
 returns opaque as '
 begin
@@ -158,6 +161,8 @@
     return new;
 end;' language 'plpgsql';
 
+drop function content_search__dtrg() cascade;
+
 create or replace function content_search__dtrg ()
 returns opaque as '
 begin
@@ -169,6 +174,8 @@
     return old;
 end;' language 'plpgsql';
 
+drop function content_search__utrg() cascade;
+
 create or replace function content_search__utrg ()
 returns opaque as '
 declare
@@ -192,6 +199,15 @@
 -- changes
 
 
+create trigger content_search__itrg after insert on cr_revisions
+for each row execute procedure content_search__itrg (); 
+
+create trigger content_search__dtrg after delete on cr_revisions
+for each row execute procedure content_search__dtrg (); 
+
+create trigger content_search__utrg after update on cr_revisions
+for each row execute procedure content_search__utrg (); 
+
 -- LARS: REMOVED
 
 
Index: openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql,v
diff -u -r1.2.4.2 -r1.2.4.3
--- openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql	1 Jun 2004 23:24:46 -0000	1.2.4.2
+++ openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.2-4.6.sql	15 Oct 2004 08:55:08 -0000	1.2.4.3
@@ -667,6 +667,8 @@
 
 
 -- JS: BEFORE DELETE TRIGGER to clean up CR entries (except root folder)
+
+drop function fs_package_items_delete_trig();
 create or replace function fs_package_items_delete_trig () returns opaque as '
 declare
 
@@ -710,11 +712,12 @@
 
 end;' language 'plpgsql';
 
-\i ../file-storage-simple-create.sql
-\i ../file-storage-simple-package-create.sql
+create trigger fs_package_items_delete_trig before delete
+on fs_root_folders for each row 
+execute procedure fs_package_items_delete_trig ();
 
-drop view fs_folders;
-drop view fs_files;
-drop view fs_folders_and_files;
+drop view fs_folders cascade;
+drop view fs_files cascade;
+drop view fs_folders_and_files cascade;
 
 \i ../file-storage-views-create.sql