Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl 7 Oct 2003 14:52:49 -0000 1.11
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl 12 Mar 2004 19:19:45 -0000 1.12
@@ -68,7 +68,7 @@
}
if { [empty_string_p $version(auto-mount)] && [string equal $version(package.type) apm_application] } {
- set mount_html " Mount package under the main site at path "
+ set mount_html " Mount package under the main site at path "
} else {
set mount_html ""
}
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 12 Mar 2004 18:48:47 -0000 1.34
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 12 Mar 2004 19:19:46 -0000 1.35
@@ -52,6 +52,7 @@
now(),
null,
null,
+ ''t'',
null
);
@@ -75,12 +76,12 @@
new__label,
new__description,
new__parent_id,
- new__content_id,
+ new__context_id,
new__folder_id,
new__creation_date,
new__creation_user,
new__creation_ip,
- null
+ null::integer
);
end;' language 'plpgsql';
@@ -122,10 +123,10 @@
v_package_id := new__package_id;
- if new__parent_id is not null and new__package_id is null then
+ 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__name,
new__parent_id,
@@ -221,7 +222,7 @@
v_package_id := new__package_id;
- if new__parent_id is not null and new__package_id is null then
+ 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;
@@ -298,7 +299,7 @@
new__label,
new__description,
new__parent_id,
- new__content_id,
+ new__context_id,
new__folder_id,
new__creation_date,
new__creation_user,
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-image.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-image.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-image.sql 12 Mar 2004 18:48:47 -0000 1.15
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-image.sql 12 Mar 2004 19:19:46 -0000 1.16
@@ -109,8 +109,8 @@
-- than the standard package_instantiate_object. So we don't bother calling define_function_args
-- here.
-create function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,boolean,timestamptz,varchar,integer,integer,integer,integer
- ) returns integer as '
+create or replace function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,boolean,timestamptz,varchar,integer,integer,integer,integer)
+returns integer as '
declare
new__name alias for $1;
new__parent_id alias for $2; -- default null
@@ -141,7 +141,7 @@
begin
new__context_id := new__parent_id;
- if p_package_id is null then
+ if new__package_id is null then
v_package_id := acs_object__package_id(new__parent_id);
else
v_package_id := new__package_id;
@@ -163,7 +163,7 @@
new__mime_type,
new__nls_language,
null,
- ''file'' -- storage_type,
+ ''file'', -- storage_type
v_package_id
);
@@ -211,7 +211,7 @@
return v_item_id;
end; ' language 'plpgsql';
-create function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,boolean,timestamptz,varchar,integer,integer,integer
+create or replace function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,boolean,timestamptz,varchar,integer,integer,integer
) returns integer as '
declare
new__name alias for $1;
@@ -253,7 +253,7 @@
-- DRB's version
-create function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,varchar,
+create or replace function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,varchar,
varchar,timestamptz,integer, integer, integer) returns integer as '
declare
p_name alias for $1;
@@ -333,7 +333,7 @@
return v_item_id;
end; ' language 'plpgsql';
-create function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,varchar,
+create or replace function image__new (varchar,integer,integer,integer,varchar,integer,varchar,varchar,varchar,varchar,varchar,
varchar,timestamptz,integer, integer) returns integer as '
declare
p_name alias for $1;
@@ -410,7 +410,7 @@
current_timestamp,
p_creation_user,
p_creation_ip,
- p_package_id
+ v_package_id
);
insert into images
@@ -454,7 +454,7 @@
end;' language 'plpgsql';
-create function image__delete (integer)
+create or replace function image__delete (integer)
returns integer as '
declare
v_item_id alias for $1;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 12 Mar 2004 18:48:47 -0000 1.51
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 12 Mar 2004 19:19:46 -0000 1.52
@@ -20,7 +20,7 @@
v_folder_id cr_folders.folder_id%TYPE;
begin
- if get_root_folder__item_id is NULL then
+ if get_root_folder__item_id is NULL or get_root_folder__item_id in (0,-100,-200) then
v_folder_id := content_item_globals.c_root_folder_id;
@@ -504,7 +504,7 @@
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);
+ new__mime_type, new__nls_language, new__text, new__storage_type, null::integer);
return v_item_id;
@@ -631,7 +631,7 @@
now(),
null,
null,
- v_parent_id
+ v_parent_id,
''t'',
v_rel_tag || '': '' || v_parent_id || '' - '' || v_item_id,
v_package_id
@@ -708,7 +708,7 @@
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);
+ new__mime_type, new__nls_language, new__data, null::integer);
return v_item_id;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 12 Mar 2004 18:48:47 -0000 1.36
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 12 Mar 2004 19:19:46 -0000 1.37
@@ -269,8 +269,8 @@
new__creation_ip,
new__item_id,
''t'',
- v_package_id,
- new__title
+ new__title,
+ v_package_id
);
select storage_type into v_storage_type
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 12 Mar 2004 18:48:47 -0000 1.15
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 12 Mar 2004 19:19:46 -0000 1.16
@@ -205,7 +205,7 @@
new__creation_ip alias for $6; -- default null
new__text alias for $7; -- default null
new__is_live alias for $8; -- default ''f''
- new__package_id alias for $7; -- default null
+ new__package_id alias for $9; -- default null
v_template_id cr_templates.template_id%TYPE;
v_package_id acs_objects.package_id%TYPE;
v_parent_id cr_items.parent_id%TYPE;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 17 Feb 2004 15:32:50 -0000 1.32
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 12 Mar 2004 19:19:46 -0000 1.33
@@ -688,7 +688,20 @@
-- the data attribute for this view will be problematic.
execute ''create view '' || v_table_name ||
- ''i as select acs_objects.*, cr.revision_id, cr.title, cr.item_id,
+ ''i as select acs_objects.object_id,
+ acs_objects.object_type,
+ acs_objects.title as object_title,
+ acs_objects.package_id as object_package_id,
+ acs_objects.context_id,
+ acs_objects.security_inherit_p,
+ acs_objects.creation_user,
+ acs_objects.creation_date,
+ acs_objects.creation_ip,
+ acs_objects.last_modified,
+ acs_objects.modifying_user,
+ acs_objects.modifying_ip,
+ acs_objects.tree_sortkey,
+ acs_objects.max_child_sortkey, cr.revision_id, cr.title, cr.item_id,
content_revision__get_content(cr.revision_id) as data,
cr_text.text_data as text,
cr.description, cr.publish_date, cr.mime_type, cr.nls_language'' ||
@@ -703,7 +716,20 @@
end if;
execute ''create view '' || v_table_name ||
- ''x as select acs_objects.*, cr.revision_id, cr.title, cr.item_id,
+ ''x as select acs_objects.object_id,
+ acs_objects.object_type,
+ acs_objects.title as object_title,
+ acs_objects.package_id as object_package_id,
+ acs_objects.context_id,
+ acs_objects.security_inherit_p,
+ acs_objects.creation_user,
+ acs_objects.creation_date,
+ acs_objects.creation_ip,
+ acs_objects.last_modified,
+ acs_objects.modifying_user,
+ acs_objects.modifying_ip,
+ acs_objects.tree_sortkey,
+ acs_objects.max_child_sortkey, cr.revision_id, cr.title, cr.item_id,
cr.description, cr.publish_date, cr.mime_type, cr.nls_language,
i.name, i.parent_id'' ||
cols ||
Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql 12 Mar 2004 18:48:52 -0000 1.17
+++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql 12 Mar 2004 19:19:46 -0000 1.18
@@ -204,12 +204,11 @@
p_data,
p_parent_id,
p_context_id,
- p_creation_date,
p_creation_user,
p_creation_ip,
p_object_type,
p_is_live,
- null
+ null::integer
);
end;' language 'plpgsql';
Index: openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql 28 Aug 2003 09:45:29 -0000 1.9
+++ openacs-4/packages/bug-tracker/sql/postgresql/bug-tracker-create.sql 12 Mar 2004 19:19:47 -0000 1.10
@@ -62,7 +62,8 @@
now(), -- creation_date
v_creation_user, -- creation_user
v_creation_ip, -- creation_ip,
- ''t'' -- security_inherit_p
+ ''t'', -- security_inherit_p
+ p_package_id -- package_id
);
-- Set package_id column. Oddly enoguh, there is no API to set it
Index: openacs-4/packages/download/sql/postgresql/download-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/postgresql/download-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/sql/postgresql/download-create.sql 17 May 2003 10:28:58 -0000 1.6
+++ openacs-4/packages/download/sql/postgresql/download-create.sql 12 Mar 2004 19:19:47 -0000 1.7
@@ -311,7 +311,9 @@
create view download_repository_obj as
select repository_id,
- o.*,
+ o.object_id, o.object_type, o.title as obj_title, o.package_id as obj_package_id, o.context_id,
+ o.security_inherit_p, o.creation_user, o.creation_date, o.creation_ip, o.last_modified, o.modifying_user,
+ o.modifying_ip, o.tree_sortkey, o.max_child_sortkey,
i.parent_id,
r.title,
r.description,
@@ -341,7 +343,9 @@
create view download_arch_revisions_obj as
select dar.*,
- o.*,
+ o.object_id, o.object_type, o.title as obj_title, o.package_id as obj_package_id, o.context_id,
+ o.security_inherit_p, o.creation_user, o.creation_date, o.creation_ip, o.last_modified, o.modifying_user,
+ o.modifying_ip, o.tree_sortkey, o.max_child_sortkey,
r.item_id as archive_id,
r.title as file_name,
r.description as version_name,
Index: openacs-4/packages/lars-blogger/www/blog-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/lars-blogger/www/blog-postgresql.xql 27 Feb 2004 18:30:59 -0000 1.11
+++ openacs-4/packages/lars-blogger/www/blog-postgresql.xql 12 Mar 2004 19:19:48 -0000 1.12
@@ -42,8 +42,8 @@
as entry_date_ansi,
to_char(current_timestamp,'YYYY-MM-DD HH24:MI:SS')
as sysdate_ansi,
- title,
- title_url,
+ e.title,
+ e.title_url,
e.category_id,
com.category_id as sw_category_id,
content,
@@ -64,7 +64,7 @@
left outer join category_object_map com
on (com.object_id = e.entry_id)
$sw_category_filter_join_clause
- where package_id = :package_id
+ where e.package_id = :package_id
[ad_decode $date_clause "" "" "and $date_clause"]
and draft_p = 'f'
and deleted_p = 'f'
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.15 -r1.16
--- openacs-4/packages/news/sql/postgresql/news-create.sql 6 Oct 2003 12:11:23 -0000 1.15
+++ openacs-4/packages/news/sql/postgresql/news-create.sql 12 Mar 2004 19:19:48 -0000 1.16
@@ -887,7 +887,7 @@
ci.item_id as item_id,
cn.package_id as package_id,
revision_id,
- title as publish_title,
+ cr.title as publish_title,
cr.content as publish_body,
(case when cr.mime_type = 'text/html' then 't' else 'f' end) as html_p,
cr.publish_date,
Index: openacs-4/packages/press/sql/postgresql/press-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/sql/postgresql/press-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/sql/postgresql/press-create.sql 4 Nov 2003 20:02:27 -0000 1.2
+++ openacs-4/packages/press/sql/postgresql/press-create.sql 12 Mar 2004 19:19:48 -0000 1.3
@@ -374,7 +374,7 @@
as
select ci.item_id as item_id,
press_id,
- package_id,
+ cp.package_id,
publication_name,
publication_link,
publication_date,
@@ -403,7 +403,7 @@
create or replace view press_items_approved
as
select ci.item_id as item_id,
- package_id,
+ cp.package_id,
publication_name,
publication_link,
publication_date,
@@ -431,15 +431,15 @@
as
select revision_id,
cr.item_id as item_id,
- package_id,
- publication_name,
- publication_link,
- publication_date,
- publication_date_desc,
+ cp.package_id,
+ cp.publication_name,
+ cp.publication_link,
+ cp.publication_date,
+ cp.publication_date_desc,
cr.title as article_title,
cr.content as article_abstract,
cr.description as revision_note,
- article_link,
+ cp.article_link,
article_pages,
article_abstract_html_p as html_p,
release_date,