Index: openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql 15 Jan 2004 02:58:52 -0000 1.3 +++ openacs-4/contrib/packages/portal/sql/oracle/layout-package-create.sql 6 Jun 2004 02:29:09 -0000 1.4 @@ -31,7 +31,6 @@ p_name in portal_layouts.name%TYPE, p_description in portal_layouts.description%TYPE default null, p_filename in portal_layouts.filename%TYPE, - p_resource_dir in portal_layouts.resource_dir%TYPE, p_object_type in acs_objects.object_type%TYPE default 'portal_layout', p_creation_date in acs_objects.creation_date%TYPE default sysdate, p_creation_user in acs_objects.creation_user%TYPE default null, @@ -60,7 +59,6 @@ p_name in portal_layouts.name%TYPE, p_description in portal_layouts.description%TYPE default null, p_filename in portal_layouts.filename%TYPE, - p_resource_dir in portal_layouts.resource_dir%TYPE, p_object_type in acs_objects.object_type%TYPE default 'portal_layout', p_creation_date in acs_objects.creation_date%TYPE default sysdate, p_creation_user in acs_objects.creation_user%TYPE default null, @@ -81,9 +79,9 @@ ); insert into portal_layouts - (layout_id, name, description, filename, resource_dir) + (layout_id, name, description, filename) values - (v_layout_id, p_name, p_description, p_filename, p_resource_dir); + (v_layout_id, p_name, p_description, p_filename); return v_layout_id; Index: openacs-4/contrib/packages/portal/sql/oracle/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/oracle/portal-core-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/contrib/packages/portal/sql/oracle/portal-core-create.sql 2 Jun 2004 23:38:07 -0000 1.4 +++ openacs-4/contrib/packages/portal/sql/oracle/portal-core-create.sql 6 Jun 2004 02:29:10 -0000 1.5 @@ -194,8 +194,7 @@ constraint p_layouts_name_nn not null, description varchar(200), - filename varchar(200), - resource_dir varchar(200) + filename varchar(200) ); comment on table portal_layouts is ' Index: openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql 12 Mar 2004 04:54:04 -0000 1.6 +++ openacs-4/contrib/packages/portal/sql/postgresql/datasource-package-create.sql 6 Jun 2004 02:29:10 -0000 1.7 @@ -23,7 +23,7 @@ -- @version $Id$ -- -select define_function_args('portal_datasource__new', 'name,pretty_name,application,owner,template,admin_p;f,shadeable_p;t,hideable_p;t,description'); +select define_function_args('portal_datasource__new', 'p_name,p_pretty_name,p_application,p_owner,p_template,p_admin_p;f,p_shadeable_p;t,p_hideable_p;t,p_description'); create or replace function portal_datasource__new (varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar, varchar) returns integer as ' @@ -51,7 +51,7 @@ end;' language 'plpgsql'; -select define_function_args('portal_datasource__del', 'datasource_id'); +select define_function_args('portal_datasource__del', 'p_datasource_id'); create or replace function portal_datasource__del (integer) returns integer as ' @@ -67,7 +67,7 @@ end;' language 'plpgsql'; -select define_function_args('portal_datasource__set_def_param', 'datasource_id,config_required_p,configured_p,key,value'); +select define_function_args('portal_datasource__set_def_param', 'p_datasource_id,p_config_required_p,p_configured_p,p_key,p_value'); create or replace function portal_datasource__set_def_param (integer,varchar,varchar,varchar,varchar) returns integer as ' Index: openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql 15 Jan 2004 02:58:52 -0000 1.3 +++ openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql 6 Jun 2004 02:29:10 -0000 1.4 @@ -23,7 +23,7 @@ -- @version $Id$ -- -select define_function_args('portal_layout__new', 'layout_id,name,description,filename,resource_dir,object_type;portal_layout,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('portal_layout__new', 'p_layout_id,p_name,p_description,p_filename,p_object_type;portal_layout,p_creation_date,p_creation_user,p_creation_ip,p_context_id'); create or replace function portal_layout__new (integer,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' @@ -32,7 +32,6 @@ p_name alias for $2; p_description alias for $3; -- default null p_filename alias for $4; - p_resource_dir alias for $5; p_object_type alias for $6; -- default ''portal_layout'' p_creation_date alias for $7; -- default current_timestamp p_creation_user alias for $8; -- default null @@ -56,15 +55,15 @@ ); insert into portal_layouts - (layout_id, name, description, filename, resource_dir) + (layout_id, name, description, filename) values - (v_layout_id, p_name, p_description, p_filename, p_resource_dir); + (v_layout_id, p_name, p_description, p_filename); return v_layout_id; end;' language 'plpgsql'; -select define_function_args('portal_layout__add_region', 'layout_id,region'); +select define_function_args('portal_layout__add_region', 'p_layout_id,p_region'); create or replace function portal_layout__add_region(integer,varchar) returns integer as ' @@ -81,7 +80,7 @@ end;' language 'plpgsql'; -select define_function_args('portal_layout__del', 'layout_id'); +select define_function_args('portal_layout__del', 'p_layout_id'); create or replace function portal_layout__del(integer) returns integer as ' Index: openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql 15 Jan 2004 02:58:52 -0000 1.3 +++ openacs-4/contrib/packages/portal/sql/postgresql/page-package-create.sql 6 Jun 2004 02:29:10 -0000 1.4 @@ -23,7 +23,7 @@ -- @version $Id$ -- -select define_function_args('portal_page__new', 'page_id,name,portal_id,layout_id,object_type;portal_page,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('portal_page__new', 'p_page_id,p_name,p_portal_id,p_layout_id,p_object_type;portal_page,p_creation_date,p_creation_user,p_creation_ip,p_context_id'); create or replace function portal_page__new (integer,varchar,integer,integer,varchar,timestamptz,integer,varchar,integer) returns integer as ' @@ -74,7 +74,7 @@ end;' language 'plpgsql'; -select define_function_args('portal_page__del', 'page_id'); +select define_function_args('portal_page__del', 'p_page_id'); create or replace function portal_page__del(integer) returns integer as ' Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql,v diff -u -N -r1.10 -r1.11 --- openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql 23 Mar 2004 03:04:08 -0000 1.10 +++ openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql 6 Jun 2004 02:29:10 -0000 1.11 @@ -199,8 +199,7 @@ constraint p_layouts_name_nn not null, description varchar(200), - filename varchar(200), - resource_dir varchar(200) + filename varchar(200) ); comment on table portal_layouts is ' Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql,v diff -u -N -r1.7 -r1.8 --- openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql 12 Mar 2004 04:54:04 -0000 1.7 +++ openacs-4/contrib/packages/portal/sql/postgresql/portal-package-create.sql 6 Jun 2004 02:29:10 -0000 1.8 @@ -23,7 +23,7 @@ -- @version $Id$ -- -select define_function_args('portal__new', 'portal_id,owner_id,package_id,name,theme_id,template_id,object_type;portal,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('portal__new', 'p_portal_id,p_owner_id,p_package_id,p_name,p_theme_id,p_template_id,p_object_type;portal,p_creation_date,p_creation_user,p_creation_ip,p_context_id'); create or replace function portal__new (integer,integer, integer, varchar, integer, integer, varchar, timestamptz, integer, varchar, integer) returns integer as ' @@ -155,7 +155,7 @@ end;' language 'plpgsql'; -select define_function_args('portal__del', 'portal_id'); +select define_function_args('portal__del', 'p_portal_id'); create or replace function portal__del(integer) returns integer as ' Index: openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql 15 Jan 2004 02:58:52 -0000 1.3 +++ openacs-4/contrib/packages/portal/sql/postgresql/theme-package-create.sql 6 Jun 2004 02:29:10 -0000 1.4 @@ -23,7 +23,7 @@ -- @version $Id$ -- -select define_function_args('portal_theme__new', 'theme_id,name,description,filename,resource_dir,object_type;portal_theme,creation_date,creation_user,creation_ip,context_id'); +select define_function_args('portal_theme__new', 'p_theme_id,p_name,p_description,p_filename,p_resource_dir,p_object_type;portal_theme,p_creation_date,p_creation_user,p_creation_ip,p_context_id'); create or replace function portal_theme__new (integer,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer) returns integer as ' @@ -88,7 +88,7 @@ end;' language 'plpgsql'; -select define_function_args('portal_theme__del', 'theme_id'); +select define_function_args('portal_theme__del', 'p_theme_id'); create or replace function portal_theme__del(integer) returns integer as ' Index: openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl 24 Mar 2004 00:47:26 -0000 1.13 +++ openacs-4/contrib/packages/portal/tcl/apm-callback-procs.tcl 6 Jun 2004 02:29:10 -0000 1.14 @@ -26,135 +26,135 @@ # Now define some default layouts. set var_list { - {name 1_column} - {description "One column"} - {filename /packages/portal/lib/layouts/simple} + {p_name 1_column} + {p_description "One column"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name 2_column} - {description "Two columns"} - {filename /packages/portal/lib/layouts/simple} + {p_name 2_column} + {p_description "Two columns"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name 3_column} - {description "Three columns"} - {filename /packages/portal/lib/layouts/simple} + {p_name 3_column} + {p_description "Three columns"} + {p_filename /packages/portal/lib/layouts/simple} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 3]] + [list p_layout_id $layout_id] \ + [list p_region 3]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name left_sidebar} - {description "Left sidebar"} - {filename /packages/portal/lib/layouts/left-sidebar} + {p_name left_sidebar} + {p_description "Left sidebar"} + {p_filename /packages/portal/lib/layouts/left-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name right_sidebar} - {description "Right sidebar"} - {filename /packages/portal/lib/layouts/right-sidebar} + {p_name right_sidebar} + {p_description "Right sidebar"} + {p_filename /packages/portal/lib/layouts/right-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list { - {name left_right_sidebar} - {description "Left and right sidebars"} - {filename /packages/portal/lib/layouts/left-right-sidebar} + {p_name left_right_sidebar} + {p_description "Left and right sidebars"} + {p_filename /packages/portal/lib/layouts/left-right-sidebar} } set layout_id [package_instantiate_object -var_list $var_list portal_layout] set var_list [list \ - [list layout_id $layout_id] \ - [list region 1]] + [list p_layout_id $layout_id] \ + [list p_region 1]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 2]] + [list p_layout_id $layout_id] \ + [list p_region 2]] package_exec_plsql -var_list $var_list portal_layout add_region set var_list [list \ - [list layout_id $layout_id] \ - [list region 3]] + [list p_layout_id $layout_id] \ + [list p_region 3]] package_exec_plsql -var_list $var_list portal_layout add_region # And some themes set var_list { - {name default} - {description "Default OpenACS Theme"} - {filename /packages/portal/lib/themes/standard-theme} - {resource_dir /resources/portal/themes/standard-theme} + {p_name default} + {p_description "Default OpenACS Theme"} + {p_filename /packages/portal/lib/themes/standard-theme} + {p_resource_dir /resources/portal/themes/standard-theme} } package_instantiate_object -var_list $var_list portal_theme set var_list { - {name blank} - {description "No graphics"} - {filename /packages/portal/lib/themes/nada-theme} - {resource_dir /resources/portal/themes/nada-theme} + {p_name blank} + {p_description "No graphics"} + {p_filename /packages/portal/lib/themes/nada-theme} + {p_resource_dir /resources/portal/themes/nada-theme} } package_instantiate_object -var_list $var_list portal_theme set var_list { - {name deco} - {description "An Art Deco Theme"} - {filename /packages/portal/lib/themes/deco-theme} - {resource_dir /resources/portal/themes/deco-theme} + {p_name deco} + {p_description "An Art Deco Theme"} + {p_filename /packages/portal/lib/themes/deco-theme} + {p_resource_dir /resources/portal/themes/deco-theme} } package_instantiate_object -var_list $var_list portal_theme Index: openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl 21 Mar 2004 02:39:57 -0000 1.7 +++ openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl 6 Jun 2004 02:29:10 -0000 1.8 @@ -81,15 +81,15 @@ db_transaction { set var_list [list \ - [list name $datasource(name)] \ - [list pretty_name $datasource(pretty_name)] \ - [list owner $datasource(owner)] \ - [list application $datasource(application)] \ - [list template $datasource(template)] \ - [list admin_p $datasource(admin_p)] \ - [list shadeable_p $datasource(shadeable_p)] \ - [list hideable_p $datasource(hideable_p)] \ - [list description $datasource(description)]] + [list p_name $datasource(name)] \ + [list p_pretty_name $datasource(pretty_name)] \ + [list p_owner $datasource(owner)] \ + [list p_application $datasource(application)] \ + [list p_template $datasource(template)] \ + [list p_admin_p $datasource(admin_p)] \ + [list p_shadeable_p $datasource(shadeable_p)] \ + [list p_hideable_p $datasource(hideable_p)] \ + [list p_description $datasource(description)]] set datasource_id [package_exec_plsql -var_list $var_list portal_datasource new] @@ -131,11 +131,11 @@ } { set var_list [list \ - [list datasource_id $datasource_id] \ - [list config_required_p $config_required_p] \ - [list configured_p $configured_p] \ - [list key $key] \ - [list value $value]] + [list p_datasource_id $datasource_id] \ + [list p_config_required_p $config_required_p] \ + [list p_configured_p $configured_p] \ + [list p_key $key] \ + [list p_value $value]] package_exec_plsql -var_list $var_list portal_datasource set_def_param } @@ -155,7 +155,7 @@ } acs_sc::impl::delete -contract_name portal_datasource -impl_name $name - set var_list [list [list datasource_id $datasource_id]] + set var_list [list [list p_datasource_id $datasource_id]] return [package_exec_plsql -var_list $var_list portal_datasource del] } Index: openacs-4/contrib/packages/portal/tcl/datasource-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/datasource-procs.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/portal/tcl/datasource-procs.xql 16 Jan 2004 01:43:40 -0000 1.3 +++ openacs-4/contrib/packages/portal/tcl/datasource-procs.xql 6 Jun 2004 02:29:10 -0000 1.4 @@ -22,7 +22,7 @@ select datasource_id from portal_datasources - where name = :name; + where name = :name Index: openacs-4/contrib/packages/portal/tcl/page-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/page-procs.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/contrib/packages/portal/tcl/page-procs.tcl 21 Mar 2004 02:39:57 -0000 1.7 +++ openacs-4/contrib/packages/portal/tcl/page-procs.tcl 6 Jun 2004 02:29:10 -0000 1.8 @@ -37,17 +37,17 @@ set layout_id [portal::layout::get_id_from_name -name $layout_name] set var_list [list \ - [list portal_id $portal_id] \ - [list name $name] \ - [list layout_id $layout_id]] + [list p_portal_id $portal_id] \ + [list p_name $name] \ + [list p_layout_id $layout_id]] return [package_instantiate_object -var_list $var_list portal_page] } ad_proc -public delete { {-page_id:required} } { - package_exec_plsql -var_list [list [list page_id $page_id]] portal_page del + package_exec_plsql -var_list [list [list p_page_id $page_id]] portal_page del } ad_proc -public get { Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v diff -u -N -r1.28 -r1.29 --- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl 28 May 2004 12:27:05 -0000 1.28 +++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl 6 Jun 2004 02:29:10 -0000 1.29 @@ -85,12 +85,12 @@ db_transaction { set var_list [subst { - {name "$name"} - {template_id $template_id} - {context_id $context_id} - {owner_id $owner_id} - {theme_id [portal::theme::get_id -name $theme_name]} - {package_id $package_id}}] + {p_name "$name"} + {p_template_id $template_id} + {p_context_id $context_id} + {p_owner_id $owner_id} + {p_theme_id [portal::theme::get_id -name $theme_name]} + {p_package_id $package_id}}] set portal_id [package_instantiate_object -var_list $var_list portal]