Index: openacs-4/packages/new-portal/sql/oracle/objects-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/objects-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/sql/oracle/objects-drop.sql	29 Mar 2002 18:48:28 -0000	1.2
+++ openacs-4/packages/new-portal/sql/oracle/objects-drop.sql	1 Jul 2002 20:03:49 -0000	1.3
@@ -16,34 +16,35 @@
 
 --
 -- The New Portal Package
--- copyright 2001, OpenForce, Inc.
--- distributed under the GNU GPL v2
 --
--- Arjun Sanyal (arjun@openforce.net)
--- $Id$
+-- @author Arjun Sanyal (arjun@openforce.net)
+-- @version $Id$
 --
 
 -- XXX - FIX ME Do this the "right way"
 
-delete from acs_permissions where object_id in (
-	(select object_id from acs_objects where object_type in (
-	'portal', 'portal_element_theme','portal_layout', 'portal_datasource'
-	))
-);
+delete
+from acs_permissions
+where object_id in (select object_id
+                    from acs_objects
+                    where object_type in ('portal_page', 'portal', 'portal_element_theme','portal_layout', 'portal_datasource'));
 
-delete from acs_permissions where object_id in (
-	(select package_id from apm_packages where package_key = 'portal')
-);
+delete
+from acs_permissions
+where object_id in (select package_id
+                    from apm_packages
+                    where package_key = 'portal');
 
-delete from acs_objects where object_type in (
-	'portal', 'portal_element_theme','portal_layout', 'portal_datasource'
-);
+delete
+from acs_objects
+where object_type in ('portal_page', 'portal', 'portal_element_theme','portal_layout', 'portal_datasource');
 
 begin
-	acs_object_type.drop_type('portal');
-	acs_object_type.drop_type('portal_element_theme');
-	acs_object_type.drop_type('portal_layout');
-	acs_object_type.drop_type('portal_datasource');
+    acs_object_type.drop_type('portal');
+    acs_object_type.drop_type('portal_page');
+    acs_object_type.drop_type('portal_element_theme');
+    acs_object_type.drop_type('portal_layout');
+    acs_object_type.drop_type('portal_datasource');
 end;
 /
 show errors