Index: openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql 13 Mar 2002 22:50:53 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql 23 Feb 2003 16:24:35 -0000 1.6 @@ -26,13 +26,6 @@ select acs_privilege__create_privilege('bboard_delete_category',null,null); select acs_privilege__create_privilege('bboard_delete_message',null,null); select acs_privilege__create_privilege('bboard_moderate_forum',null,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; - select acs_privilege__add_child('create','bboard_create_forum'); select acs_privilege__add_child('create','bboard_create_category'); select acs_privilege__add_child('create','bboard_create_message'); @@ -45,15 +38,7 @@ select acs_privilege__add_child('delete','bboard_delete_forum'); select acs_privilege__add_child('delete','bboard_delete_category'); select acs_privilege__add_child('delete','bboard_delete_message'); - - -- 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','bboard_moderate_forum'); + select acs_privilege__add_child('admin','bboard_moderate_forum'); end; Index: openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql,v diff -u -r1.18 -r1.19 --- openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 10 Feb 2003 17:37:00 -0000 1.18 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql 23 Feb 2003 16:22:33 -0000 1.19 @@ -870,3 +870,5 @@ end; / show errors + + 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.5 -r1.6 --- openacs-4/packages/acs-content-repository/www/index.vuh 24 Sep 2002 00:14:40 -0000 1.5 +++ openacs-4/packages/acs-content-repository/www/index.vuh 23 Feb 2003 16:23:14 -0000 1.6 @@ -21,16 +21,13 @@ [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 -# 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. - +ns_log notice "RESOLVING URL: $the_root $the_url" if { [content::init the_url the_root $content_root $template_root public $revision_id] } { set file "$the_root/$the_url" - rp_internal_redirect -absolute_path $file + ns_log notice "RESOLVED URL: $file" + rp_serve_abstract_file $file } else { # ns_returnnotfound set page "[ad_header {Content Item Not Found}]" Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 18 Feb 2003 20:54:32 -0000 1.11 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 23 Feb 2003 16:23:55 -0000 1.12 @@ -186,22 +186,9 @@ -- Administrators can read, write, create, and delete. -- --------------------------------------------------------- - -- 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('admin', 'read'); select acs_privilege__add_child('admin', 'write'); select acs_privilege__add_child('admin', '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('admin', 'delete'); end; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql,v diff -u -r1.23 -r1.24 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 23 Feb 2003 05:58:25 -0000 1.23 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 23 Feb 2003 16:23:55 -0000 1.24 @@ -56,19 +56,7 @@ create index acs_priv_hier_child_priv_idx on acs_privilege_hierarchy (child_privilege); -create table acs_privilege_hierarchy_index ( - privilege varchar(100) not null - constraint acs_priv_hier_priv_fk - references acs_privileges (privilege), - child_privilege varchar(100) not null - constraint acs_priv_hier_child_priv_fk - references acs_privileges (privilege), - tree_sortkey varbit -); -create index priv_hier_sortkey_idx on -acs_privilege_hierarchy_index (tree_sortkey); - -- Added table to materialize view that previously used -- acs_privilege_descendant_map name -- @@ -89,7 +77,7 @@ -- DanW: eliminated hierarchy index in favor of using descendant map -create or replace function acs_priv_hier_ins_tr() returns opaque as ' +create function acs_priv_hier_ins_tr() returns opaque as ' declare v_rec record; v_id integer; @@ -159,7 +147,7 @@ -create or replace function recurse_del_priv_hier(varchar,varchar) +create function recurse_del_priv_hier(varchar,varchar) returns varchar as ' declare parent alias for $1; @@ -187,7 +175,7 @@ return null; end;' language 'plpgsql'; -create or replace function acs_priv_hier_del_tr() returns opaque as ' +create function acs_priv_hier_del_tr() returns opaque as ' declare v_rec record; v_id integer;