Index: openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql 3 Sep 2001 18:40:46 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql 23 Feb 2003 18:22:05 -0000 1.4 @@ -27,22 +27,10 @@ -- bind privileges to privilege heirarchy - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; - select acs_privilege__add_child('create', 'postcard_create_image'); select acs_privilege__add_child('create', 'postcard_create_card'); select acs_privilege__add_child('read', 'postcard_read'); - -- re-enable the trigger before the last insert to force the - -- acs_privilege_hierarchy_index table to be updated. - - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - select acs_privilege__add_child('admin','postcard_admin'); end; Index: openacs-4/packages/acs-content-repository/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/index.vuh,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-content-repository/www/index.vuh 23 Feb 2003 16:23:14 -0000 1.6 +++ openacs-4/packages/acs-content-repository/www/index.vuh 23 Feb 2003 18:19:19 -0000 1.7 @@ -3,7 +3,6 @@ ################################################# ad_page_contract { - @author Unknown @creation-date Unknown @cvs-id $Id$ @@ -21,13 +20,16 @@ [db_string content_root "select content_item.get_root_folder from dual"] set template_root \ [db_string template_root "select content_template.get_root_folder from dual"] + # Serve the page -ns_log notice "RESOLVING URL: $the_root $the_url" +# DRB: Note that content::init modifies the local variable the_root, which is treated +# as though it's been passed by reference. This requires that the redirect treat the +# path as an absolute path within the filesystem. + if { [content::init the_url the_root $content_root $template_root public $revision_id] } { set file "$the_root/$the_url" - ns_log notice "RESOLVED URL: $file" - rp_serve_abstract_file $file + rp_internal_redirect -absolute_path $file } else { # ns_returnnotfound set page "[ad_header {Content Item Not Found}]" Index: openacs-4/packages/cms/sql/postgresql/cms-permissions.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-permissions.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/cms/sql/postgresql/cms-permissions.sql 20 Sep 2002 03:54:26 -0000 1.9 +++ openacs-4/packages/cms/sql/postgresql/cms-permissions.sql 23 Feb 2003 18:19:48 -0000 1.10 @@ -53,16 +53,9 @@ return 0; end;' language 'plpgsql'; --- temporarily drop this trigger to avoid a data-change violation --- on acs_privilege_hierarchy_index while updating the child privileges. -drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; - select inline_0 (); -create trigger acs_priv_hier_ins_del_tr after insert or delete -on acs_privilege_hierarchy for each row -execute procedure acs_priv_hier_ins_del_tr (); drop function inline_0 (); Index: openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 12 Jun 2002 15:24:02 -0000 1.2 +++ openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql 23 Feb 2003 18:20:31 -0000 1.3 @@ -13,10 +13,6 @@ create function inline_0 () returns integer as ' begin - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; - -- remove children perform acs_privilege__remove_child(''read'',''forum_read''); perform acs_privilege__remove_child(''create'',''forum_create''); @@ -27,11 +23,6 @@ perform acs_privilege__remove_child(''forum_moderate'',''forum_post''); perform acs_privilege__remove_child(''forum_write'',''forum_read''); - -- reenable for trigger update - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - perform acs_privilege__remove_child(''forum_write'',''forum_post''); perform acs_privilege__drop_privilege(''forum_moderate''); Index: openacs-4/packages/news/sql/postgresql/news-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/postgresql/news-create.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/news/sql/postgresql/news-create.sql 17 Jul 2002 20:21:20 -0000 1.9 +++ openacs-4/packages/news/sql/postgresql/news-create.sql 23 Feb 2003 18:21:19 -0000 1.10 @@ -25,11 +25,6 @@ select acs_privilege__create_privilege('news_delete', null, null); select acs_privilege__create_privilege('news_admin', 'News Administrator', null); - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; - -- bind privileges to global names select acs_privilege__add_child('read', 'news_read'); select acs_privilege__add_child('create', 'news_create'); @@ -41,13 +36,6 @@ select acs_privilege__add_child('news_admin', 'news_read'); select acs_privilege__add_child('news_admin', 'news_create'); - -- re-enable the trigger before the last insert to force the - -- acs_privilege_hierarchy_index table to be updated. - - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - select acs_privilege__add_child('news_admin', 'news_delete'); end; Index: openacs-4/packages/postcard/sql/postgresql/postcard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/sql/postgresql/postcard-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/postcard/sql/postgresql/postcard-create.sql 3 Sep 2001 18:40:46 -0000 1.3 +++ openacs-4/packages/postcard/sql/postgresql/postcard-create.sql 23 Feb 2003 18:22:05 -0000 1.4 @@ -27,22 +27,10 @@ -- bind privileges to privilege heirarchy - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; - select acs_privilege__add_child('create', 'postcard_create_image'); select acs_privilege__add_child('create', 'postcard_create_card'); select acs_privilege__add_child('read', 'postcard_read'); - -- re-enable the trigger before the last insert to force the - -- acs_privilege_hierarchy_index table to be updated. - - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - select acs_privilege__add_child('admin','postcard_admin'); end; Index: openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql 19 Sep 2002 13:40:03 -0000 1.5 +++ openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql 23 Feb 2003 18:22:40 -0000 1.6 @@ -53,9 +53,6 @@ begin; - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; select acs_privilege__add_child('survsimp_admin_survey','survsimp_create_survey'); select acs_privilege__add_child('survsimp_admin_survey','survsimp_modify_survey'); @@ -66,13 +63,7 @@ select acs_privilege__add_child('read','survsimp_take_survey'); - -- re-enable the trigger before the last insert to force the - -- acs_privilege_hierarchy_index table to be updated. - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - select acs_privilege__add_child('admin','survsimp_admin_survey'); end; Index: openacs-4/packages/survey/sql/postgresql/survey-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/sql/postgresql/survey-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/survey/sql/postgresql/survey-create.sql 30 Nov 2002 17:49:43 -0000 1.6 +++ openacs-4/packages/survey/sql/postgresql/survey-create.sql 23 Feb 2003 18:23:26 -0000 1.7 @@ -32,9 +32,6 @@ begin; - -- temporarily drop this trigger to avoid a data-change violation - -- on acs_privilege_hierarchy_index while updating the child privileges. - drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy; select acs_privilege__add_child('survey_admin_survey','survey_create_survey'); select acs_privilege__add_child('survey_admin_survey','survey_modify_survey'); @@ -44,14 +41,6 @@ select acs_privilege__add_child('survey_admin_survey','survey_delete_question'); select acs_privilege__add_child('read','survey_take_survey'); - - -- re-enable the trigger before the last insert to force the - -- acs_privilege_hierarchy_index table to be updated. - - create trigger acs_priv_hier_ins_del_tr after insert or delete - on acs_privilege_hierarchy for each row - execute procedure acs_priv_hier_ins_del_tr (); - select acs_privilege__add_child('admin','survey_admin_survey'); end;