Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.1d1-5.2.1d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.1d1-5.2.1d2.sql,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.1d1-5.2.1d2.sql 4 Jan 2006 15:51:41 -0000 1.1.2.3 +++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.1d1-5.2.1d2.sql 12 Jan 2006 18:23:55 -0000 1.1.2.4 @@ -56,6 +56,10 @@ end;' language 'plpgsql' stable; +-- content_item__new + +select define_function_args('content_item__new','name,parent_id,item_id,locale,creation_date;now,creation_user,context_id,creation_ip,item_subtype;content_item,content_type;content_revision,title,description,mime_type;text/plain,nls_language,text,data,relation_tag,is_live;f,storage_type;lob,package_id'); + create or replace function content_item__new ( cr_items.name%TYPE, cr_items.parent_id%TYPE, @@ -107,7 +111,6 @@ v_rel_id acs_objects.object_id%TYPE; v_rel_tag cr_child_rels.relation_tag%TYPE; v_context_id acs_objects.context_id%TYPE; - v_package_id acs_objects.package_id%TYPE; v_storage_type cr_items.storage_type%TYPE; begin @@ -134,12 +137,6 @@ v_title := new__title; end if; - if new__package_id is null and v_parent_id != -4 then - v_package_id := acs_object__package_id(content_item__get_root_folder(v_parent_id)); - else - v_package_id := new__package_id; - end if; - if v_parent_id = -4 or content_folder__is_folder(v_parent_id) = ''t'' then @@ -185,7 +182,7 @@ v_context_id, ''t'', v_title, - v_package_id + new__package_id ); @@ -208,7 +205,7 @@ v_parent_id, ''t'', v_rel_tag || '': '' || v_parent_id || '' - '' || v_item_id, - v_package_id + new__package_id ); insert into cr_child_rels ( @@ -233,7 +230,7 @@ new__creation_date, new__creation_user, new__creation_ip, - v_package_id + new__package_id ); elsif new__text is not null or new__title is not null then @@ -250,7 +247,7 @@ new__creation_date, new__creation_user, new__creation_ip, - v_package_id + new__package_id ); end if; @@ -264,6 +261,60 @@ end;' language 'plpgsql'; +create or replace function content_item__new ( + cr_items.name%TYPE, + cr_items.parent_id%TYPE, + acs_objects.object_id%TYPE, + cr_items.locale%TYPE, + acs_objects.creation_date%TYPE, + acs_objects.creation_user%TYPE, + acs_objects.context_id%TYPE, + acs_objects.creation_ip%TYPE, + acs_object_types.object_type%TYPE, + acs_object_types.object_type%TYPE, + cr_revisions.title%TYPE, + cr_revisions.description%TYPE, + cr_revisions.mime_type%TYPE, + cr_revisions.nls_language%TYPE, + varchar, + cr_revisions.content%TYPE, + cr_child_rels.relation_tag%TYPE, + boolean, + cr_items.storage_type%TYPE +) returns integer as ' +declare + new__name alias for $1; + new__parent_id alias for $2; + new__item_id alias for $3; + new__locale alias for $4; + new__creation_date alias for $5; + new__creation_user alias for $6; + new__context_id alias for $7; + new__creation_ip alias for $8; + new__item_subtype alias for $9; + new__content_type alias for $10; + new__title alias for $11; + new__description alias for $12; + new__mime_type alias for $13; + new__nls_language alias for $14; + new__text alias for $15; + new__data alias for $16; + new__relation_tag alias for $17; + new__is_live alias for $18; + new__storage_type alias for $19; + v_item_id cr_items.item_id%TYPE; +begin + v_item_id := content_item__new (new__name, new__parent_id, new__item_id, new__locale, + new__creation_date, new__creation_user, new__context_id, new__creation_ip, + new__item_subtype, new__content_type, new__title, new__description, + new__mime_type, new__nls_language, new__text, new__data, new__relation_tag, + new__is_live, new__storage_type, null); + + return v_item_id; + +end;' language 'plpgsql'; + +-- create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer) returns integer as ' declare @@ -295,7 +346,6 @@ v_rel_id acs_objects.object_id%TYPE; v_rel_tag cr_child_rels.relation_tag%TYPE; v_context_id acs_objects.context_id%TYPE; - v_package_id acs_objects.package_id%TYPE; begin -- place the item in the context of the pages folder if no @@ -314,12 +364,6 @@ v_context_id := new__context_id; end if; - if new__package_id is null then - v_package_id := acs_object__package_id(content_item__get_root_folder(v_parent_id)); - else - v_package_id := new__package_id; - end if; - if v_parent_id = -4 or content_folder__is_folder(v_parent_id) = ''t'' then @@ -358,7 +402,7 @@ v_context_id, ''t'', coalesce(new__title,new__name), - v_package_id + new__package_id ); insert into cr_items ( @@ -388,7 +432,7 @@ v_parent_id, ''t'', v_rel_tag || '': '' || v_parent_id || '' - '' || v_item_id, - v_package_id + new__package_id ); insert into cr_child_rels ( @@ -421,7 +465,7 @@ new__creation_date, new__creation_user, new__creation_ip, - v_package_id + new__package_id ); end if; @@ -435,7 +479,36 @@ end;' language 'plpgsql'; +create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar) +returns integer as ' +declare + new__name alias for $1; + new__parent_id alias for $2; -- default null + new__item_id alias for $3; -- default null + new__locale alias for $4; -- default null + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__context_id alias for $7; -- default null + new__creation_ip alias for $8; -- default null + new__item_subtype alias for $9; -- default ''content_item'' + new__content_type alias for $10; -- default ''content_revision'' + new__title alias for $11; -- default null + new__description alias for $12; -- default null + new__mime_type alias for $13; -- default ''text/plain'' + new__nls_language alias for $14; -- default null + new__text alias for $15; -- default null + new__storage_type alias for $16; -- check in (''text'',''file'') + v_item_id cr_items.item_id%TYPE; +begin + v_item_id := content_item__new (new__name, new__parent_id, new__item_id, new__locale, + new__creation_date, new__creation_user, new__context_id, new__creation_ip, + new__item_subtype, new__content_type, new__title, new__description, + new__mime_type, new__nls_language, new__text, new__storage_type, null::integer); + return v_item_id; + +end;' language 'plpgsql'; + create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer) returns integer as ' declare @@ -467,7 +540,6 @@ v_rel_id acs_objects.object_id%TYPE; v_rel_tag cr_child_rels.relation_tag%TYPE; v_context_id acs_objects.context_id%TYPE; - v_package_id acs_objects.package_id%TYPE; begin -- place the item in the context of the pages folder if no @@ -486,12 +558,6 @@ v_context_id := new__context_id; end if; - if new__package_id is null then - v_package_id := acs_object__package_id(content_item__get_root_folder(v_parent_id)); - else - v_package_id := new__package_id; - end if; - -- use the name of the item if no title is supplied if new__title is null or new__title = '''' then v_title := new__name; @@ -537,7 +603,7 @@ v_context_id, ''t'', v_title, - v_package_id + new__package_id ); insert into cr_items ( @@ -567,7 +633,7 @@ v_parent_id, ''t'', v_rel_tag || '': '' || v_parent_id || '' - '' || v_item_id, - v_package_id + new__package_id ); insert into cr_child_rels ( @@ -594,7 +660,7 @@ new__creation_date, new__creation_user, new__creation_ip, - v_package_id + new__package_id ); elsif new__title is not null then @@ -611,7 +677,7 @@ new__creation_date, new__creation_user, new__creation_ip, - v_package_id + new__package_id ); end if; @@ -625,180 +691,68 @@ end;' language 'plpgsql'; - -create or replace function content_item__new ( integer, varchar, integer, varchar, timestamptz, integer, integer, varchar, boolean, varchar, text, varchar, boolean, varchar,varchar,varchar,integer) +create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer) returns integer as ' declare - new__item_id alias for $1; --default null - new__name alias for $2; - new__parent_id alias for $3; -- default null - new__title alias for $4; -- default null - new__creation_date alias for $5; -- default now() - new__creation_user alias for $6; -- default null - new__context_id alias for $7; -- default null - new__creation_ip alias for $8; -- default null - new__is_live alias for $9; -- default ''f'' - new__mime_type alias for $10; - new__text alias for $11; -- default null - new__storage_type alias for $12; -- check in (''text'', ''file'') - new__security_inherit_p alias for $13; -- default ''t'' - new__storage_area_key alias for $14; -- default ''CR_FILES'' - new__item_subtype alias for $15; - new__content_type alias for $16; - new__package_id alias for $17; -- default null - new__description varchar default null; - new__relation_tag varchar default null; - new__nls_language varchar default null; - v_parent_id cr_items.parent_id%TYPE; - v_parent_type acs_objects.object_type%TYPE; + new__name alias for $1; + new__parent_id alias for $2; -- default null + new__item_id alias for $3; -- default null + new__locale alias for $4; -- default null + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__context_id alias for $7; -- default null + new__creation_ip alias for $8; -- default null + new__item_subtype alias for $9; -- default ''content_item'' + new__content_type alias for $10; -- default ''content_revision'' + new__title alias for $11; -- default null + new__description alias for $12; -- default null + new__mime_type alias for $13; -- default ''text/plain'' + new__nls_language alias for $14; -- default null +-- changed to integer for blob_id + new__data alias for $15; -- default null v_item_id cr_items.item_id%TYPE; - v_revision_id cr_revisions.revision_id%TYPE; - v_title cr_revisions.title%TYPE; - v_rel_id acs_objects.object_id%TYPE; - v_rel_tag cr_child_rels.relation_tag%TYPE; - v_context_id acs_objects.context_id%TYPE; - v_package_id acs_objects.package_id%TYPE; begin + v_item_id := content_item__new (new__name, new__parent_id, new__item_id, new__locale, + new__creation_date, new__creation_user, new__context_id, new__creation_ip, + new__item_subtype, new__content_type, new__title, new__description, + new__mime_type, new__nls_language, new__data, null::integer); - -- place the item in the context of the pages folder if no - -- context specified - - if new__parent_id is null then - v_parent_id := content_item_globals.c_root_folder_id; - else - v_parent_id := new__parent_id; - end if; - - -- Determine context_id - if new__context_id is null then - v_context_id := v_parent_id; - else - v_context_id := new__context_id; - end if; - - -- use the name of the item if no title is supplied - if new__title is null or new__title = '''' then - v_title := new__name; - else - v_title := new__title; - end if; - - if new__package_id is null then - v_package_id := acs_object__package_id(content_item__get_root_folder(v_parent_id)); - else - v_package_id := new__package_id; - end if; - - if v_parent_id = -4 or - content_folder__is_folder(v_parent_id) = ''t'' then - - if v_parent_id != -4 and - content_folder__is_registered( - v_parent_id, new__content_type, ''f'') = ''f'' then - - raise EXCEPTION ''-20000: This items content type % is not registered to this folder %'', new__content_type, v_parent_id; - end if; - - else if v_parent_id != -4 then - - select object_type into v_parent_type from acs_objects - where object_id = v_parent_id; - - if NOT FOUND then - raise EXCEPTION ''-20000: Invalid parent ID % specified in content_item.new'', v_parent_id; - end if; - - if content_item__is_subclass(v_parent_type, ''content_item'') = ''t'' and - content_item__is_valid_child(v_parent_id, new__content_type) = ''f'' then - - raise EXCEPTION ''-20000: This items content type % is not allowed in this container %'', new__content_type, v_parent_id; - end if; - - end if; end if; - + return v_item_id; - -- Create the object +end;' language 'plpgsql'; - v_item_id := acs_object__new( - new__item_id, - new__item_subtype, - new__creation_date, - new__creation_user, - new__creation_ip, - v_context_id, - new__security_inherit_p, - v_title, - v_package_id - ); +create or replace function content_item__new(varchar,integer,varchar,text,text,integer) +returns integer as ' +declare + new__name alias for $1; + new__parent_id alias for $2; -- default null + new__title alias for $3; -- default null + new__description alias for $4; -- default null + new__text alias for $5; -- default null + new__package_id alias for $6; -- default null +begin + return content_item__new(new__name, + new__parent_id, + null, + null, + now(), + null, + null, + null, + ''content_item'', + ''content_revision'', + new__title, + new__description, + ''text/plain'', + null, + new__text, + ''text'', + new__package_id + ); - insert into cr_items ( - item_id, name, content_type, parent_id, storage_type, storage_area_key - ) values ( - v_item_id, new__name, new__content_type, v_parent_id, new__storage_type, - new__storage_area_key - ); - - -- if the parent is not a folder, insert into cr_child_rels - if v_parent_id != -4 and - content_folder__is_folder(v_parent_id) = ''f'' and - content_item__is_valid_child(v_parent_id, new__content_type) = ''t'' then - - if new__relation_tag is null then - v_rel_tag := content_item__get_content_type(v_parent_id) - || ''-'' || new__content_type; - else - v_rel_tag := new__relation_tag; - end if; - - v_rel_id := acs_object__new( - null, - ''cr_item_child_rel'', - new__creation_date, - null, - null, - v_parent_id, - ''f'', - v_rel_tag || '': '' || v_parent_id || '' - '' || v_item_id, - v_package_id - ); - - insert into cr_child_rels ( - rel_id, parent_id, child_id, relation_tag, order_n - ) values ( - v_rel_id, v_parent_id, v_item_id, v_rel_tag, v_item_id - ); - - end if; - - if new__title is not null or - new__text is not null then - - v_revision_id := content_revision__new( - v_title, - new__description, - now(), - new__mime_type, - null, - new__text, - v_item_id, - null, - new__creation_date, - new__creation_user, - new__creation_ip, - v_package_id - ); - - end if; - - -- make the revision live if is_live is true - if new__is_live = ''t'' then - PERFORM content_item__set_live_revision(v_revision_id); - end if; - - return v_item_id; - end;' language 'plpgsql'; +-- content_folder__new create or replace function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar, boolean,integer) returns integer as ' @@ -814,7 +768,6 @@ new__creation_ip alias for $9; -- default null new__security_inherit_p alias for $10; -- default true new__package_id alias for $11; -- default null - v_package_id acs_objects.object_id%TYPE; v_folder_id cr_folders.folder_id%TYPE; v_context_id acs_objects.context_id%TYPE; begin @@ -836,12 +789,6 @@ else - v_package_id := new__package_id; - - if new__parent_id is not null and new__parent_id not in (-100,-200) and new__package_id is null then - v_package_id := acs_object__package_id(content_item__get_root_folder(new__parent_id)); - end if; - v_folder_id := content_item__new( new__folder_id, new__name, @@ -859,13 +806,13 @@ ''CR_FILES'', ''content_folder'', ''content_folder'', - v_package_id + new__package_id ); insert into cr_folders ( folder_id, label, description, package_id ) values ( - v_folder_id, new__label, new__description, v_package_id + v_folder_id, new__label, new__description, new__package_id ); -- set the correct object title @@ -897,6 +844,7 @@ return v_folder_id; end;' language 'plpgsql'; + create or replace function content_folder__is_sub_folder (integer,integer) returns boolean as ' declare