Index: openacs-4/packages/new-portal/sql/oracle/api-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/api-create.sql,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/new-portal/sql/oracle/api-create.sql	24 May 2002 01:58:46 -0000	1.37
+++ openacs-4/packages/new-portal/sql/oracle/api-create.sql	1 Jul 2002 20:03:49 -0000	1.38
@@ -19,550 +19,575 @@
 -- copyright 2001, OpenForce, Inc.
 -- distributed under the GNU GPL v2
 --
--- Arjun Sanyal (arjun@openforce.net)
--- $Id$
+-- @author Arjun Sanyal (arjun@openforce.net)
+-- @version $Id$
 --
 
 create or replace package portal_page
 as
-	function new (
-		page_id                 in portal_pages.page_id%TYPE default null,
-		pretty_name		in portal_pages.pretty_name%TYPE default 'Untitled Page',
-		portal_id		in portal_pages.portal_id%TYPE default null,
-		layout_id		in portal_pages.layout_id%TYPE default null,
-		sort_key		in portal_pages.sort_key%TYPE default 0,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_page',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_pages.page_id%TYPE;
 
-	procedure delete (
-		page_id                 in portal_pages.page_id%TYPE
-	);
+    function new (
+        page_id                     in portal_pages.page_id%TYPE default null,
+        pretty_name                 in portal_pages.pretty_name%TYPE default 'Untitled Page',
+        portal_id                   in portal_pages.portal_id%TYPE,
+        layout_id                   in portal_pages.layout_id%TYPE default null,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_page',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_pages.page_id%TYPE;
+
+    procedure delete (
+        page_id                     in portal_pages.page_id%TYPE
+    );
+
 end portal_page;
 /
 show errors
 
 create or replace package body portal_page
 as
-	function new (
-		page_id                 in portal_pages.page_id%TYPE default null,
-		pretty_name		in portal_pages.pretty_name%TYPE default 'Untitled Page',
-		portal_id		in portal_pages.portal_id%TYPE default null,
-		layout_id		in portal_pages.layout_id%TYPE default null,
-		sort_key		in portal_pages.sort_key%TYPE default 0,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_page',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_pages.page_id%TYPE
-	is
-		v_page_id portal_pages.page_id%TYPE;
-		v_layout_id portal_pages.layout_id%TYPE;
-		v_sort_key portal_pages.sort_key%TYPE;
-	begin
-		v_page_id := acs_object.new (
-			object_type	=> object_type,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		);
 
-                if layout_id is null then             
-                   select min(layout_id) into v_layout_id from portal_layouts;
-                else 
-                   v_layout_id := layout_id;
-                end if;
+    function new (
+        page_id                     in portal_pages.page_id%TYPE default null,
+        pretty_name                 in portal_pages.pretty_name%TYPE default 'Untitled Page',
+        portal_id                   in portal_pages.portal_id%TYPE,
+        layout_id                   in portal_pages.layout_id%TYPE default null,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_page',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_pages.page_id%TYPE
+    is
+        v_page_id                   portal_pages.page_id%TYPE;
+        v_layout_id                 portal_pages.layout_id%TYPE;
+        v_sort_key                  portal_pages.sort_key%TYPE;
+    begin
 
-                if portal_id is not null then             
-                   select max(sort_key) + 1  into v_sort_key 
-                   from portal_pages 
-                   where portal_id = portal_page.new.portal_id;                   
-                   if v_sort_key is null then
-                      v_sort_key := 0;
-                   end if;
-                else 
-                    raise_application_error(-20000, 'NULL portal_id sent to portal_page.new!');
-                end if;
+        v_page_id := acs_object.new(
+            object_type => object_type,
+            creation_date => creation_date,
+            creation_user => creation_user,
+            creation_ip => creation_ip,
+            context_id => context_id
+        );
 
-		insert into portal_pages 
-                       (page_id, pretty_name, portal_id, layout_id, sort_key)
-		values (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key);
+        if layout_id is null then
+            select min(layout_id)
+            into v_layout_id
+            from portal_layouts;
+        else
+            v_layout_id := layout_id;
+        end if;
 
-                return v_page_id;
-	end new;
+        select nvl(max(sort_key) + 1, 0)
+        into v_sort_key
+        from portal_pages
+        where portal_id = portal_page.new.portal_id;
 
-	procedure delete (
-		page_id         in portal_pages.page_id%TYPE
-	)
-	is
-		v_portal_id portal_pages.portal_id%TYPE;
-		v_sort_key portal_pages.sort_key%TYPE;
-		v_curr_sort_key portal_pages.sort_key%TYPE;
-		v_page_count_from_0 integer;
-	begin
-                -- sort keys MUST be an unbroken sequece from 0 to max(sort_key)
-                select portal_id into v_portal_id 
-                from portal_pages
-                where page_id = portal_page.delete.page_id;
+        insert into portal_pages
+        (page_id, pretty_name, portal_id, layout_id, sort_key)
+        values
+        (v_page_id, pretty_name, portal_id, v_layout_id, v_sort_key);
 
-                select sort_key into v_sort_key
+        return v_page_id;
+
+    end new;
+
+    procedure delete (
+        page_id                     in portal_pages.page_id%TYPE
+    )
+    is
+        v_portal_id                 portal_pages.portal_id%TYPE;
+        v_sort_key                  portal_pages.sort_key%TYPE;
+        v_curr_sort_key             portal_pages.sort_key%TYPE;
+        v_page_count_from_0         integer;
+    begin
+
+        -- IMPORTANT: sort keys MUST be an unbroken sequence from 0 to max(sort_key)
+
+        select portal_id, sort_key
+        into v_portal_id, v_sort_key
+        from portal_pages
+        where page_id = portal_page.delete.page_id;
+
+        select (count(*) - 1)
+        into v_page_count_from_0
+        from portal_pages
+        where portal_id = v_portal_id;
+
+        for i in 0 .. v_page_count_from_0 loop
+
+            if i = v_sort_key then
+
+                delete
                 from portal_pages
                 where page_id = portal_page.delete.page_id;
 
-                select (count(*) - 1) into v_page_count_from_0
-                from portal_pages
-                where portal_id = v_portal_id;
-                
-                for i in 0..v_page_count_from_0 loop
-                  if i = v_sort_key then
-                    delete from portal_pages where page_id = portal_page.delete.page_id;
-                  elsif i > v_sort_key then
-                    -- raise_application_error(-20000, 'del ' || i || ' ' || v_sort_key );
-                    update portal_pages set sort_key = -1 where sort_key = i;
-                    update portal_pages set sort_key = i - 1 where sort_key = -1;
-                  end if;
-                end loop;
+            elsif i > v_sort_key then
 
-                acs_object.delete(page_id);
-	end delete;
+                update portal_pages
+                set sort_key = -1
+                where sort_key = i;
 
+                update portal_pages
+                set sort_key = i - 1
+                where sort_key = -1;
+
+            end if;
+
+        end loop;
+
+        acs_object.delete(page_id);
+
+    end delete;
+
 end portal_page;
 /
 show errors
 
 create or replace package portal
 as
+
     function new (
-        portal_id		in portals.portal_id%TYPE default null,
-        name			in portals.name%TYPE default 'Untitled',
-        theme_id		in portals.theme_id%TYPE default null,
-        layout_id		in portal_layouts.layout_id%TYPE default null,
-        template_id		in portals.template_id%TYPE default null,
-        default_page_name       in portal_pages.pretty_name%TYPE default 'Main Page',
-        object_type		in acs_object_types.object_type%TYPE default 'portal',
-        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, 
-        context_id		in acs_objects.context_id%TYPE default null 
+        portal_id                   in portals.portal_id%TYPE default null,
+        name                        in portals.name%TYPE default 'Untitled',
+        theme_id                    in portals.theme_id%TYPE default null,
+        layout_id                   in portal_layouts.layout_id%TYPE default null,
+        template_id                 in portals.template_id%TYPE default null,
+        default_page_name           in portal_pages.pretty_name%TYPE default 'Main Page',
+        object_type                 in acs_object_types.object_type%TYPE default 'portal',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
     ) return portals.portal_id%TYPE;
 
-	procedure delete (
-		portal_id	in portals.portal_id%TYPE
-	);
+    procedure delete (
+        portal_id                   in portals.portal_id%TYPE
+    );
 end portal;
 /
 show errors
 
 create or replace package body portal
 as
-	function new (
-		portal_id		in portals.portal_id%TYPE default null,
-		name			in portals.name%TYPE default 'Untitled',
-		theme_id		in portals.theme_id%TYPE default null,
-		layout_id		in portal_layouts.layout_id%TYPE default null,
-		template_id		in portals.template_id%TYPE default null,
-                default_page_name       in portal_pages.pretty_name%TYPE default 'Main Page',
-		object_type		in acs_object_types.object_type%TYPE default 'portal',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portals.portal_id%TYPE
-	is
-		v_portal_id portals.portal_id%TYPE;
-		v_theme_id portals.theme_id%TYPE;
-		v_layout_id portal_layouts.layout_id%TYPE;
-		v_page_id portal_pages.page_id%TYPE;
-		v_new_element_id portal_element_map.element_id%TYPE;
-		v_new_parameter_id portal_element_parameters.parameter_id%TYPE;
-	begin
+    function new (
+        portal_id                   in portals.portal_id%TYPE default null,
+        name                        in portals.name%TYPE default 'Untitled',
+        theme_id                    in portals.theme_id%TYPE default null,
+        layout_id                   in portal_layouts.layout_id%TYPE default null,
+        template_id                 in portals.template_id%TYPE default null,
+        default_page_name           in portal_pages.pretty_name%TYPE default 'Main Page',
+        object_type                 in acs_object_types.object_type%TYPE default 'portal',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portals.portal_id%TYPE
+    is
+        v_portal_id                 portals.portal_id%TYPE;
+        v_theme_id                  portals.theme_id%TYPE;
+        v_layout_id                 portal_layouts.layout_id%TYPE;
+        v_page_id                   portal_pages.page_id%TYPE;
+        v_new_element_id            portal_element_map.element_id%TYPE;
+        v_new_parameter_id          portal_element_parameters.parameter_id%TYPE;
+    begin
 
-                -- we must create at least one page for this portal
-		v_portal_id := acs_object.new (
-			object_id	=> portal_id,
-			object_type	=> object_type,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		);
+        v_portal_id := acs_object.new(
+            object_id  => portal_id,
+            object_type => object_type,
+            creation_date => creation_date,
+            creation_user => creation_user,
+            creation_ip => creation_ip,
+            context_id => context_id
+        );
 
-                if template_id is null then	       
+        if template_id is null then
 
-                   if portal.new.theme_id is null then
-                      select max(theme_id) into v_theme_id from portal_element_themes;
-                   else 
-                        v_theme_id := portal.new.theme_id;
-                   end if;
-                   
-                   if layout_id is null then
-                     select min(layout_id) into v_layout_id from portal_layouts;
-                   else 
-                     v_layout_id := portal.new.layout_id;
-                   end if;
+            if portal.new.theme_id is null then
+                select max(theme_id)
+                into v_theme_id
+                from portal_element_themes;
+            else
+                v_theme_id := portal.new.theme_id;
+            end if;
 
-                   insert into portals 
-                          (portal_id, name, theme_id)
-                   values (v_portal_id, name, v_theme_id);
+            if layout_id is null then
+                select min(layout_id)
+                into v_layout_id
+                from portal_layouts;
+            else
+                v_layout_id := portal.new.layout_id;
+            end if;
 
-                   -- now insert the default page
-		   v_page_id := portal_page.new (
-			portal_id	=> v_portal_id,
-			pretty_name     => default_page_name,      
-                        layout_id       => v_layout_id,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		   );
-                else
-                   -- we have a portal as our template. Copy it's theme, pages, layouts,
-                   -- elements, and element params.
-                   select theme_id into v_theme_id 
-                   from portals 
-                   where portal_id = portal.new.template_id;
+            insert
+            into portals
+            (portal_id, name, theme_id)
+            values
+            (v_portal_id, name, v_theme_id);
 
-                   insert into portals 
-                   (portal_id, name, theme_id, template_id)
-                   values 
-                   (v_portal_id, name, v_theme_id, portal.new.template_id);
+            -- now insert the default page
+            v_page_id := portal_page.new (
+                portal_id => v_portal_id,
+                pretty_name => default_page_name,
+                layout_id => v_layout_id,
+                creation_date => creation_date,
+                creation_user => creation_user,
+                creation_ip => creation_ip,
+                context_id => context_id
+            );
 
-                   for page in (select * from portal_pages where portal_id = portal.new.template_id) loop
-                       -- now insert the pages from the portal template
-		       v_page_id := portal_page.new (
-		            portal_id       => v_portal_id,
-		            pretty_name     => page.pretty_name,      
-                            layout_id       => page.layout_id,
-                            sort_key        => page.sort_key
-		       );                                      
-                       
-                       for element in (select * from portal_element_map where page_id = page.page_id) loop
-                           -- now get the elements on the template's page and put them on the new page
-                           select acs_object_id_seq.nextval into v_new_element_id from dual;                        
-                
-                           insert into portal_element_map               
-                           (element_id, name, pretty_name, page_id, datasource_id, region, state, sort_key)
-                           select                 
-                           v_new_element_id, name, pretty_name, v_page_id, datasource_id, region, state, sort_key
-                           from portal_element_map pem
-                           where pem.element_id = element.element_id;
-                           
-                           for param in (select * from portal_element_parameters where element_id = element.element_id) loop 
-                               -- now for the element's params
-                               select acs_object_id_seq.nextval into v_new_parameter_id from dual;
-                                                          
-                               insert into portal_element_parameters
-                               (parameter_id, element_id, config_required_p, configured_p, key, value)
-                               select v_new_parameter_id, v_new_element_id, config_required_p, configured_p, key, value
-                               from portal_element_parameters
-                               where parameter_id = param.parameter_id;
+        else
 
-                           end loop;
-                       end loop;
-                   end loop;
-                end if;
+            -- we have a portal as our template. copy it's theme, pages, layouts,
+            -- elements, and element params.
+            select theme_id
+            into v_theme_id
+            from portals
+            where portal_id = portal.new.template_id;
 
+            insert
+            into portals
+            (portal_id, name, theme_id, template_id)
+            values
+            (v_portal_id, name, v_theme_id, portal.new.template_id);
 
-		return v_portal_id;
-	end new;
+            -- now insert the pages from the portal template
+            for page in (select *
+                         from portal_pages
+                         where portal_id = portal.new.template_id)
+            loop
 
-	procedure delete (
-		portal_id	in portals.portal_id%TYPE
-	)
-	is
-	begin
-                  for page in (select page_id
-                               from portal_pages 
-                               where portal_id = portal.delete.portal_id
-                               order by sort_key desc) 
-                  loop
-                       -- delete this portal's pages
-		       portal_page.delete (
-		            page_id       => page.page_id
-                       );                                      
-                   end loop;
+                v_page_id := portal_page.new(
+                    portal_id => v_portal_id,
+                    pretty_name => page.pretty_name,
+                    layout_id => page.layout_id
+                );
 
-		acs_object.delete(portal_id);
-	end delete;
+                -- now get the elements on the template's page and put them on the new page
+                for element in (select *
+                                from portal_element_map
+                                where page_id = page.page_id)
+                loop
 
+                    select acs_object_id_seq.nextval
+                    into v_new_element_id
+                    from dual;
+
+                    insert
+                    into portal_element_map
+                    (element_id, name, pretty_name, page_id, datasource_id, region, state, sort_key)
+                    select v_new_element_id, name, pretty_name, v_page_id, datasource_id, region, state, sort_key
+                    from portal_element_map pem
+                    where pem.element_id = element.element_id;
+
+                    -- now for the element's params
+                    for param in (select *
+                                  from portal_element_parameters
+                                  where element_id = element.element_id)
+                    loop
+
+                        select acs_object_id_seq.nextval
+                        into v_new_parameter_id
+                        from dual;
+
+                        insert
+                        into portal_element_parameters
+                        (parameter_id, element_id, config_required_p, configured_p, key, value)
+                        select v_new_parameter_id, v_new_element_id, config_required_p, configured_p, key, value
+                        from portal_element_parameters
+                        where parameter_id = param.parameter_id;
+
+                    end loop;
+
+                end loop;
+
+            end loop;
+
+        end if;
+
+        return v_portal_id;
+
+    end new;
+
+    procedure delete (
+        portal_id                   in portals.portal_id%TYPE
+    )
+    is
+    begin
+
+        for page in (select page_id
+                     from portal_pages
+                     where portal_id = portal.delete.portal_id
+                     order by sort_key desc)
+        loop
+            portal_page.delete(page_id => page.page_id);
+        end loop;
+
+        acs_object.delete(portal_id);
+
+    end delete;
+
 end portal;
 /
 show errors
 
-
--- Portal element themes
 create or replace package portal_element_theme
 as
-	function new (
-		theme_id		in portal_element_themes.theme_id%TYPE default null,
-		name			in portal_element_themes.name%TYPE,
-		description		in portal_element_themes.description%TYPE default null,
-		filename		in portal_element_themes.filename%TYPE,
-		resource_dir		in portal_element_themes.resource_dir%TYPE,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_element_theme',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_element_themes.theme_id%TYPE;
+    function new (
+        theme_id                    in portal_element_themes.theme_id%TYPE default null,
+        name                        in portal_element_themes.name%TYPE,
+        description                 in portal_element_themes.description%TYPE default null,
+        filename                    in portal_element_themes.filename%TYPE,
+        resource_dir                in portal_element_themes.resource_dir%TYPE,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_element_theme',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_element_themes.theme_id%TYPE;
 
-	procedure delete (
-		theme_id	in portal_element_themes.theme_id%TYPE
-	);
+    procedure delete (
+        theme_id                    in portal_element_themes.theme_id%TYPE
+    );
 
 end portal_element_theme;
 /
 show errors
 
 create or replace package body portal_element_theme
 as
-	function new (
-		theme_id		in portal_element_themes.theme_id%TYPE default null,
-		name			in portal_element_themes.name%TYPE,
-		description		in portal_element_themes.description%TYPE default null,
-		filename		in portal_element_themes.filename%TYPE,
-		resource_dir		in portal_element_themes.resource_dir%TYPE,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_element_theme',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_element_themes.theme_id%TYPE
-	is
-		v_theme_id portal_element_themes.theme_id%TYPE;
-	begin
-		v_theme_id := acs_object.new (
-			object_id	=> theme_id,
-			object_type	=> object_type,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		);
+    function new (
+        theme_id                    in portal_element_themes.theme_id%TYPE default null,
+        name                        in portal_element_themes.name%TYPE,
+        description                 in portal_element_themes.description%TYPE default null,
+        filename                    in portal_element_themes.filename%TYPE,
+        resource_dir                in portal_element_themes.resource_dir%TYPE,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_element_theme',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_element_themes.theme_id%TYPE
+    is
+        v_theme_id                  portal_element_themes.theme_id%TYPE;
+    begin
 
-		insert into portal_element_themes
-			(theme_id, name, description, filename, resource_dir)
-		values
-			(v_theme_id, name, description, filename, resource_dir);
+        v_theme_id := acs_object.new(
+            object_id => theme_id,
+            object_type => object_type,
+            creation_date => creation_date,
+            creation_user => creation_user,
+            creation_ip => creation_ip,
+            context_id => context_id
+        );
 
-		return v_theme_id;
-	end new;
+        insert
+        into portal_element_themes
+        (theme_id, name, description, filename, resource_dir)
+        values
+        (v_theme_id, name, description, filename, resource_dir);
 
-	procedure delete (
-		theme_id	in portal_element_themes.theme_id%TYPE
-	)
-	is
-	begin
-		acs_object.delete(theme_id);
-	end delete;
+        return v_theme_id;
 
+    end new;
+
+    procedure delete (
+        theme_id                    in portal_element_themes.theme_id%TYPE
+    )
+    is
+    begin
+        acs_object.delete(theme_id);
+    end delete;
+
 end portal_element_theme;
 /
 show errors
 
--- Portal layouts
 create or replace package portal_layout
 as
-	function new (
-		layout_id		in portal_layouts.layout_id%TYPE default null,
-		name			in portal_layouts.name%TYPE,
-		description		in portal_layouts.description%TYPE default null,
-		filename		in portal_layouts.filename%TYPE,
-		resource_dir		in portal_layouts.resource_dir%TYPE,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_layout',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_layouts.layout_id%TYPE;
 
-	procedure delete (
-		layout_id	in portal_layouts.layout_id%TYPE
-	);
+    function new (
+        layout_id                   in portal_layouts.layout_id%TYPE default null,
+        name                        in portal_layouts.name%TYPE,
+        description                 in portal_layouts.description%TYPE default null,
+        filename                    in portal_layouts.filename%TYPE,
+        resource_dir                in portal_layouts.resource_dir%TYPE,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_layout',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_layouts.layout_id%TYPE;
 
-	procedure add_region (
-		layout_id		in portal_supported_regions.layout_id%TYPE,
-		region			in portal_supported_regions.region%TYPE,
-		immutable_p		in portal_supported_regions.immutable_p%TYPE default 'f'
-	);
+    procedure delete (
+        layout_id                   in portal_layouts.layout_id%TYPE
+    );
 
+    procedure add_region (
+        layout_id                   in portal_supported_regions.layout_id%TYPE,
+        region                      in portal_supported_regions.region%TYPE,
+        immutable_p                 in portal_supported_regions.immutable_p%TYPE default 'f'
+    );
+
 end portal_layout;
 /
 show errors
 
 create or replace package body portal_layout
 as
-	function new (
-		layout_id		in portal_layouts.layout_id%TYPE default null,
-		name			in portal_layouts.name%TYPE,
-		description		in portal_layouts.description%TYPE default null,
-		filename		in portal_layouts.filename%TYPE,
-		resource_dir		in portal_layouts.resource_dir%TYPE,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_layout',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
-	) return portal_layouts.layout_id%TYPE
-	is
-		v_layout_id portal_layouts.layout_id%TYPE;
-	begin
-		v_layout_id := acs_object.new (
-			object_id	=> layout_id,
-			object_type	=> object_type,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		);
+    function new (
+        layout_id                   in portal_layouts.layout_id%TYPE default null,
+        name                        in portal_layouts.name%TYPE,
+        description                 in portal_layouts.description%TYPE default null,
+        filename                    in portal_layouts.filename%TYPE,
+        resource_dir                in portal_layouts.resource_dir%TYPE,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_layout',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_layouts.layout_id%TYPE
+    is
+        v_layout_id                 portal_layouts.layout_id%TYPE;
+    begin
 
-		insert into portal_layouts
-			(layout_id, name, description, filename, resource_dir)
-		values
-			(v_layout_id, name, description,filename, resource_dir);
+        v_layout_id := acs_object.new(
+            object_id => layout_id,
+            object_type => object_type,
+            creation_date => creation_date,
+            creation_user => creation_user,
+            creation_ip => creation_ip,
+            context_id => context_id
+        );
 
-		return v_layout_id;
-	end new;
+        insert into portal_layouts
+        (layout_id, name, description, filename, resource_dir)
+        values
+        (v_layout_id, name, description, filename, resource_dir);
 
-	procedure delete (
-		layout_id	in portal_layouts.layout_id%TYPE
-	)
-	is
-	begin
-		acs_object.delete(layout_id);
-	end delete;
+        return v_layout_id;
 
-	procedure add_region (
-		layout_id		in portal_supported_regions.layout_id%TYPE,
-		region			in portal_supported_regions.region%TYPE,
-		immutable_p		in portal_supported_regions.immutable_p%TYPE default 'f'
-	)
-	is
-	begin
-		insert into portal_supported_regions (layout_id, region, immutable_p)
-		values (layout_id, region, immutable_p);
-	end add_region;
+    end new;
 
+    procedure delete (
+        layout_id                   in portal_layouts.layout_id%TYPE
+    )
+    is
+    begin
+        acs_object.delete(layout_id);
+    end delete;
+
+    procedure add_region (
+        layout_id                   in portal_supported_regions.layout_id%TYPE,
+        region                      in portal_supported_regions.region%TYPE,
+        immutable_p                 in portal_supported_regions.immutable_p%TYPE default 'f'
+    )
+    is
+    begin
+        insert
+        into portal_supported_regions
+        (layout_id, region, immutable_p)
+        values (layout_id, region, immutable_p);
+    end add_region;
+
 end portal_layout;
 /
 show errors
 
--- datasources
 create or replace package portal_datasource
 as
-	function new (
-		datasource_id	in portal_datasources.datasource_id%TYPE default null,	
-		name		in portal_datasources.name%TYPE default null,
-		description	in portal_datasources.description%TYPE default null,
-		object_type	in acs_object_types.object_type%TYPE default 'portal_datasource',
-		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, 
-		context_id	in acs_objects.context_id%TYPE default null 
-	) return portal_datasources.datasource_id%TYPE;
 
-	procedure delete (
-		datasource_id	in portal_datasources.datasource_id%TYPE
-	);
+    function new (
+        datasource_id               in portal_datasources.datasource_id%TYPE default null,
+        name                        in portal_datasources.name%TYPE default null,
+        description                 in portal_datasources.description%TYPE default null,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_datasource',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_datasources.datasource_id%TYPE;
 
-	procedure set_def_param (
-		datasource_id		in portal_datasource_def_params.datasource_id%TYPE,
-		config_required_p	in portal_datasource_def_params.config_required_p%TYPE default null,
-		configured_p		in portal_datasource_def_params.configured_p%TYPE default null,
-		key			in portal_datasource_def_params.key%TYPE,
-		value			in portal_datasource_def_params.value%TYPE default null
-	);
+    procedure delete (
+        datasource_id               in portal_datasources.datasource_id%TYPE
+    );
 
+    procedure set_def_param (
+        datasource_id               in portal_datasource_def_params.datasource_id%TYPE,
+        config_required_p           in portal_datasource_def_params.config_required_p%TYPE default null,
+        configured_p                in portal_datasource_def_params.configured_p%TYPE default null,
+        key                         in portal_datasource_def_params.key%TYPE,
+        value                       in portal_datasource_def_params.value%TYPE default null
+    );
 
 end portal_datasource;
 /
 show errors
 
 create or replace package body portal_datasource
 as
-	function new (
-		datasource_id		in portal_datasources.datasource_id%TYPE default null,	
-		name			in portal_datasources.name%TYPE default null,
-		description		in portal_datasources.description%TYPE default null,
-		object_type		in acs_object_types.object_type%TYPE default 'portal_datasource',
-		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, 
-		context_id		in acs_objects.context_id%TYPE default null 
 
-	) return portal_datasources.datasource_id%TYPE
-	is
-		v_datasource_id		portal_datasources.datasource_id%TYPE;
-	begin
-		v_datasource_id := acs_object.new (
-			object_id	=> datasource_id,
-			object_type	=> object_type,
-			creation_date	=> creation_date,
-			creation_user	=> creation_user,
-			creation_ip	=> creation_ip,
-			context_id	=> context_id
-		);
+    function new (
+        datasource_id               in portal_datasources.datasource_id%TYPE default null,
+        name                        in portal_datasources.name%TYPE default null,
+        description                 in portal_datasources.description%TYPE default null,
+        object_type                 in acs_object_types.object_type%TYPE default 'portal_datasource',
+        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,
+        context_id                  in acs_objects.context_id%TYPE default null
+    ) return portal_datasources.datasource_id%TYPE
+    is
+        v_datasource_id             portal_datasources.datasource_id%TYPE;
+    begin
 
+        v_datasource_id := acs_object.new(
+            object_id => datasource_id,
+            object_type => object_type,
+            creation_date => creation_date,
+            creation_user => creation_user,
+            creation_ip => creation_ip,
+            context_id => context_id
+        );
 
-		insert into portal_datasources
-			(datasource_id, name, description)
-		values
-			(v_datasource_id, name, description); 
+        insert into portal_datasources
+        (datasource_id, name, description)
+        values
+        (v_datasource_id, name, description);
 
-		return v_datasource_id;
-	end new;
+        return v_datasource_id;
 
-	procedure delete (
-		datasource_id	in portal_datasources.datasource_id%TYPE
-	)
-	is
-	begin
-		acs_object.delete(datasource_id);
-	end delete;
+    end new;
 
-	procedure set_def_param (
-		datasource_id		in portal_datasource_def_params.datasource_id%TYPE,
-		config_required_p	in portal_datasource_def_params.config_required_p%TYPE default null,
-		configured_p		in portal_datasource_def_params.configured_p%TYPE default null,
-		key			in portal_datasource_def_params.key%TYPE,
-		value			in portal_datasource_def_params.value%TYPE default null
-	)
-	is
-		v_parameter_id  portal_datasource_def_params.parameter_id%TYPE;
-	begin
+    procedure delete (
+        datasource_id               in portal_datasources.datasource_id%TYPE
+    )
+    is
+    begin
+        acs_object.delete(datasource_id);
+    end delete;
 
-		select acs_object_id_seq.nextval into v_parameter_id from dual;
-		    
-		insert into portal_datasource_def_params
-			(parameter_id, datasource_id, config_required_p, configured_p, key, value)
-		values
-			(v_parameter_id, datasource_id, config_required_p, configured_p, key, value);
+    procedure set_def_param (
+        datasource_id               in portal_datasource_def_params.datasource_id%TYPE,
+        config_required_p           in portal_datasource_def_params.config_required_p%TYPE default null,
+        configured_p                in portal_datasource_def_params.configured_p%TYPE default null,
+        key                         in portal_datasource_def_params.key%TYPE,
+        value                       in portal_datasource_def_params.value%TYPE default null
+    )
+    is
+    begin
 
-	end set_def_param;
+        insert into portal_datasource_def_params
+        (parameter_id, datasource_id, config_required_p, configured_p, key, value)
+        values
+        (acs_object_id_seq.nextval, datasource_id, config_required_p, configured_p, key, value);
 
+    end set_def_param;
+
 end portal_datasource;
 /
 show errors