Index: openacs-4/packages/cms/cms.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/cms/cms.info 16 Nov 2004 23:22:35 -0000 1.13 +++ openacs-4/packages/cms/cms.info 11 Apr 2005 17:14:16 -0000 1.14 @@ -7,7 +7,7 @@ f t - + oracle postgresql @@ -24,12 +24,11 @@ acs-workflow which has been deprecated. Alternatives include etp and bcms (which is a work in progress), CMS remains the best place to look to find examples of how the content repository should be used. - - - - - - + + + + + Index: openacs-4/packages/cms/sql/oracle/cms-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/oracle/cms-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/sql/oracle/cms-create.sql 16 Nov 2004 22:32:46 -0000 1.2 +++ openacs-4/packages/cms/sql/oracle/cms-create.sql 11 Apr 2005 17:14:17 -0000 1.3 @@ -237,7 +237,7 @@ @@ cms-workflow prompt *** Compiling permissions model... -@@ cms-permissions +-- @@ cms-permissions prompt *** Compiling fixes that need to be done... @@ cms-fix Index: openacs-4/packages/cms/sql/oracle/cms-update.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/oracle/cms-update.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cms/sql/oracle/cms-update.sql 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/cms/sql/oracle/cms-update.sql 11 Apr 2005 17:14:17 -0000 1.2 @@ -1,27 +1,27 @@ -- Modify permissions to include the cm_relate permission -declare - v_exists integer; -begin - select count(*) into v_exists from acs_privileges - where privilege = 'cm_admin'; +-- declare +-- v_exists integer; +-- begin +-- select count(*) into v_exists from acs_privileges +-- where privilege = 'cm_admin'; - if v_exists > 0 then - select count(*) into v_exists from acs_privileges - where privilege = 'cm_relate'; +-- if v_exists > 0 then +-- select count(*) into v_exists from acs_privileges +-- where privilege = 'cm_relate'; - if v_exists < 1 then - acs_privilege.create_privilege('cm_relate', 'Relate Items', 'Relate Items'); - acs_privilege.add_child('cm_admin', 'cm_relate'); - update acs_privilege_hierarchy - set privilege = 'cm_relate' - where privilege = 'cm_admin' - and child_privilege = 'cm_write'; - end if; - end if; -end; -/ -show errors +-- if v_exists < 1 then +-- acs_privilege.create_privilege('cm_relate', 'Relate Items', 'Relate Items'); +-- acs_privilege.add_child('cm_admin', 'cm_relate'); +-- update acs_privilege_hierarchy +-- set privilege = 'cm_relate' +-- where privilege = 'cm_admin' +-- and child_privilege = 'cm_write'; +-- end if; +-- end if; +-- end; +-- / +-- show errors -- This parent_id column was not included in the cr_keywords table -- for RC 0. Ensure this column is there. Index: openacs-4/packages/cms/sql/postgresql/cms-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-create.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/cms/sql/postgresql/cms-create.sql 16 Nov 2004 22:32:46 -0000 1.9 +++ openacs-4/packages/cms/sql/postgresql/cms-create.sql 11 Apr 2005 17:14:17 -0000 1.10 @@ -294,13 +294,13 @@ \i cms-content-methods.sql -- prompt *** Compiling workflow model... -\i cms-publishing-wf.sql +--\i cms-publishing-wf.sql -- prompt *** Compiling workflow helper package... -\i cms-workflow.sql +--\i cms-workflow.sql -- prompt *** Compiling permissions model... -\i cms-permissions.sql +-- \i cms-permissions.sql -- prompt *** Compiling fixes that need to be done... \i cms-fix.sql Index: openacs-4/packages/cms/sql/postgresql/cms-update.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-update.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/cms/sql/postgresql/cms-update.sql 17 May 2003 10:22:35 -0000 1.4 +++ openacs-4/packages/cms/sql/postgresql/cms-update.sql 11 Apr 2005 17:14:17 -0000 1.5 @@ -1,31 +1,31 @@ -- Modify permissions to include the cm_relate permission -create or replace function inline_0 () -returns integer as ' -declare - v_exists integer; -begin - select count(*) into v_exists from acs_privileges - where privilege = ''cm_admin''; +-- create or replace function inline_0 () +-- returns integer as ' +-- declare +-- v_exists integer; +-- begin +-- select count(*) into v_exists from acs_privileges +-- where privilege = ''cm_admin''; - if v_exists > 0 then - select count(*) into v_exists from acs_privileges - where privilege = ''cm_relate''; +-- if v_exists > 0 then +-- select count(*) into v_exists from acs_privileges +-- where privilege = ''cm_relate''; - if v_exists < 1 then - update acs_privilege_hierarchy - set privilege = ''cm_relate'' - where privilege = ''cm_admin'' - and child_privilege = ''cm_write''; - end if; - end if; +-- if v_exists < 1 then +-- update acs_privilege_hierarchy +-- set privilege = ''cm_relate'' +-- where privilege = ''cm_admin'' +-- and child_privilege = ''cm_write''; +-- end if; +-- end if; - return 0; -end;' language 'plpgsql'; +-- return 0; +-- end;' language 'plpgsql'; -select inline_0 (); +-- select inline_0 (); -drop function inline_0 (); +-- drop function inline_0 (); -- show errors