Index: openacs-4/packages/cms/cms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/cms.info 23 Sep 2002 23:32:12 -0000 1.8
+++ openacs-4/packages/cms/cms.info 17 May 2003 10:22:20 -0000 1.9
@@ -19,7 +19,7 @@
-
+
Index: openacs-4/packages/cms/sql/postgresql/cms-content-methods.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-content-methods.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/sql/postgresql/cms-content-methods.sql 8 Jun 2001 01:44:53 -0000 1.4
+++ openacs-4/packages/cms/sql/postgresql/cms-content-methods.sql 17 May 2003 10:22:35 -0000 1.5
@@ -125,7 +125,7 @@
-- create or replace package body content_method as
-- function get_method
-create function content_method__get_method (varchar)
+create or replace function content_method__get_method (varchar)
returns varchar as '
declare
p_content_type alias for $1;
@@ -173,7 +173,7 @@
-- function is_mapped
-create function content_method__is_mapped (varchar,varchar)
+create or replace function content_method__is_mapped (varchar,varchar)
returns boolean as '
declare
p_content_type alias for $1;
@@ -193,7 +193,7 @@
-- procedure add_method
-create function content_method__add_method (varchar,varchar,boolean)
+create or replace function content_method__add_method (varchar,varchar,boolean)
returns integer as '
declare
p_content_type alias for $1;
@@ -234,7 +234,7 @@
-- procedure add_all_methods
-create function content_method__add_all_methods (varchar)
+create or replace function content_method__add_all_methods (varchar)
returns integer as '
declare
p_content_type alias for $1;
@@ -262,7 +262,7 @@
-- procedure set_default_method
-create function content_method__set_default_method (varchar,varchar)
+create or replace function content_method__set_default_method (varchar,varchar)
returns integer as '
declare
p_content_type alias for $1;
@@ -284,7 +284,7 @@
-- procedure unset_default_method
-create function content_method__unset_default_method (varchar)
+create or replace function content_method__unset_default_method (varchar)
returns integer as '
declare
p_content_type alias for $1;
@@ -299,7 +299,7 @@
-- procedure remove_method
-create function content_method__remove_method (varchar,varchar)
+create or replace function content_method__remove_method (varchar,varchar)
returns integer as '
declare
p_content_type alias for $1;
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 -N -r1.7 -r1.8
--- openacs-4/packages/cms/sql/postgresql/cms-create.sql 6 Jan 2003 02:05:18 -0000 1.7
+++ openacs-4/packages/cms/sql/postgresql/cms-create.sql 17 May 2003 10:22:35 -0000 1.8
@@ -14,7 +14,7 @@
\i cms-update.sql
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
declare
attr_id acs_attributes.attribute_id%TYPE;
@@ -149,7 +149,7 @@
-- create or replace package body content_module
-create function content_module__new (varchar,varchar,varchar,integer,integer)
+create or replace function content_module__new (varchar,varchar,varchar,integer,integer)
returns integer as '
declare
p_name alias for $1;
@@ -172,14 +172,14 @@
);
end;' language 'plpgsql';
-create function content_module__new (varchar,varchar,integer,integer,integer)
+create or replace function content_module__new (varchar,varchar,integer,integer,integer)
returns integer as '
begin
return content_module__new ($1, $2, cast ($3 as varchar), $4, $5);
end;' language 'plpgsql';
-- function new
-create function content_module__new (varchar,varchar,varchar,integer,integer,integer,timestamp with time zone,integer,varchar,varchar)
+create or replace function content_module__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar,varchar)
returns integer as '
declare
p_name alias for $1;
@@ -223,7 +223,7 @@
end;' language 'plpgsql';
-create function content_module__get_label (integer) returns varchar as '
+create or replace function content_module__get_label (integer) returns varchar as '
declare
p_module_id alias for $1;
v_name cm_modules.name%TYPE;
@@ -241,7 +241,7 @@
end;' language 'plpgsql';
-- Insert the default modules
-create function inline_1 () returns integer as '
+create or replace function inline_1 () returns integer as '
declare
v_id integer;
v_module_id integer;
@@ -271,7 +271,7 @@
-- Get the alphabetical ordering of a string, based on the first
-- character. Treat all non-alphabetical characters as before ''a''
-create function letter_placement (varchar) returns integer as '
+create or replace function letter_placement (varchar) returns integer as '
declare
p_word alias for $1;
v_letter varchar(1);
Index: openacs-4/packages/cms/sql/postgresql/cms-fix.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-fix.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/sql/postgresql/cms-fix.sql 22 May 2001 22:46:13 -0000 1.4
+++ openacs-4/packages/cms/sql/postgresql/cms-fix.sql 17 May 2003 10:22:35 -0000 1.5
@@ -13,7 +13,7 @@
-- content_module inherit from content_item
-- this way it is possible to grant permissions on content modules
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
declare
v_user_id users.user_id%TYPE;
Index: openacs-4/packages/cms/sql/postgresql/cms-forms.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-forms.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/sql/postgresql/cms-forms.sql 8 Jan 2003 18:41:45 -0000 1.6
+++ openacs-4/packages/cms/sql/postgresql/cms-forms.sql 17 May 2003 10:22:35 -0000 1.7
@@ -120,99 +120,8 @@
order by
object_type, sort_order;
--- create or replace package cm_form_widget
--- is
---
--- procedure set_attribute_order (
--- --/** Update the sort_order column of acs_attributes.
--- -- @author Karl Goldstein
--- -- @param content_type The name of the content type
--- -- @param attribute_name The name of the attribute
--- -- @param sort_order The sort order.
--- --*/
--- content_type in acs_attributes.object_type%TYPE,
--- attribute_name in acs_attributes.attribute_name%TYPE,
--- sort_order in acs_attributes.sort_order%TYPE
--- );
---
--- procedure register_attribute_widget (
--- --/** Register a form widget to a content type attribute. The form widget
--- -- uses the default values if none are set. If there is already a widget
--- -- registered to the attribute, the new widget replaces the old widget,
--- -- and all parameters are set to their default values.
--- -- @author Karl Goldstein, Stanislav Freidin
--- -- @param content_type The name of the content type
--- -- @param attribute_name The name of the attribute
--- -- @param widget The name of the form widget to use in metadata
--- -- forms
--- -- @param is_required Whether this form widget requires a value,
--- -- defaults to 'f'
--- -- @see /ats/form-procs.tcl/element_create,
--- -- {cm_form_widget.set_attribute_param_value},
--- -- {cm_form_widget.unregister_attribute_widget}
--- --*/
--- content_type in acs_attributes.object_type%TYPE,
--- attribute_name in acs_attributes.attribute_name%TYPE,
--- widget in cm_form_widgets.widget%TYPE,
--- is_required in cm_attribute_widgets.is_required%TYPE default 'f'
--- );
---
--- procedure unregister_attribute_widget (
--- --/** Unregister a form widget from a content type attribute.
--- -- The attribute will no longer show up on the dynamic revision
--- -- upload form.If no widget is registered to the attribute,
--- -- the procedure does nothing.
--- -- @author Karl Goldstein, Stanislav Freidin
--- -- @param content_type The name of the content type
--- -- @param attribute_name The name of the attribute for which to
--- -- unregister the widget
--- -- @see {cm_form_widget.register_attribute_widget}
--- --*/
--- content_type in acs_attributes.object_type%TYPE,
--- attribute_name in acs_attributes.attribute_name%TYPE
--- );
---
--- procedure set_attribute_param_value (
--- --/** Sets custom values for the param tag of a form widget that is
--- -- registered to a content type attribute. Unless this procedure is
--- -- called, the default form widget param values are used.
--- -- If the parameter already has a value associated with it, the old
--- -- value is overwritten.
--- -- @author Karl Goldstein, Stanislav Freidin
--- -- @param content_type The name of the content type
--- -- @param attribute_name The name of the attribute
--- -- @param param The name of the form widget parameter.
--- -- Can be an ATS 'element create' flag or an
--- -- HTML form widget tag
--- -- @param param_type The type of value the param tag expects.
--- -- Can be 'onevalue','onelist', or 'multilist',
--- -- defaults to 'onevalue'
--- -- @param param_source How the param value is to be acquired, either
--- -- 'literal', 'eval', or 'query', defaults to
--- -- 'literal'
--- -- @param value The value(s) or means or obtaining the value(s)
--- -- for the param tag
--- -- @see /ats/form-procs.tcl/element_create,
--- -- {cm_form_widget.register_attribute_widget}
--- --*/
--- content_type in acs_attributes.object_type%TYPE,
--- attribute_name in acs_attributes.attribute_name%TYPE,
--- param in cm_form_widget_params.param%TYPE,
--- value in cm_attribute_widget_params.value%TYPE,
--- param_type in cm_attribute_widget_params.param_type%TYPE
--- default 'onevalue',
--- param_source in cm_attribute_widget_params.param_source%TYPE
--- default 'literal'
--- );
---
--- end cm_form_widget;
--- show errors
-
-
--- create or replace package body cm_form_widget
--- procedure register_attribute_widget
-create function cm_form_widget__register_attribute_widget (varchar,varchar,varchar,boolean)
+create or replace function cm_form_widget__register_attribute_widget (varchar,varchar,varchar,boolean)
returns integer as '
declare
p_content_type alias for $1;
@@ -272,7 +181,7 @@
-- procedure set_attribute_order
-create function cm_form_widget__set_attribute_order (varchar,varchar,integer)
+create or replace function cm_form_widget__set_attribute_order (varchar,varchar,integer)
returns integer as '
declare
p_content_type alias for $1;
@@ -295,7 +204,7 @@
-- procedure unregister_attribute_widget
-create function cm_form_widget__unregister_attribute_widget (varchar,varchar)
+create or replace function cm_form_widget__unregister_attribute_widget (varchar,varchar)
returns integer as '
declare
p_content_type alias for $1;
@@ -337,7 +246,7 @@
-- procedure set_attribute_param_value
-create function cm_form_widget__set_attribute_param_value (varchar,varchar,varchar,varchar,varchar,varchar)
+create or replace function cm_form_widget__set_attribute_param_value (varchar,varchar,varchar,varchar,varchar,varchar)
returns integer as '
declare
p_content_type alias for $1;
@@ -405,13 +314,12 @@
return 0;
end;' language 'plpgsql';
-create function cm_form_widget__set_attribute_param_value (varchar,varchar,varchar,integer,varchar,varchar)
+
+create or replace function cm_form_widget__set_attribute_param_value (varchar,varchar,varchar,integer,varchar,varchar)
returns integer as '
begin
return cm_form_widget__set_attribute_param_value($1, $2, $3, cast ($4 as varchar), $5, $6);
end;' language 'plpgsql';
--- show errors
-
\i cms-widgets.sql
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 -N -r1.10 -r1.11
--- openacs-4/packages/cms/sql/postgresql/cms-permissions.sql 23 Feb 2003 18:19:48 -0000 1.10
+++ openacs-4/packages/cms/sql/postgresql/cms-permissions.sql 17 May 2003 10:22:35 -0000 1.11
@@ -1,7 +1,7 @@
-- This file will eventually replace content-perms.sql
-- Implements the CMS permission
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
declare
v_perms boolean default ''f'';
@@ -213,7 +213,7 @@
-- create or replace package body cms_permission
-- procedure update_permissions
-create function cms_permission__update_permissions (integer,varchar)
+create or replace function cms_permission__update_permissions (integer,varchar)
returns integer as '
declare
p_item_id alias for $1;
@@ -304,7 +304,7 @@
-- function has_grant_authority
-create function cms_permission__has_grant_authority (integer,integer,varchar)
+create or replace function cms_permission__has_grant_authority (integer,integer,varchar)
returns boolean as '
declare
p_item_id alias for $1;
@@ -328,7 +328,7 @@
-- function has_revoke_authority
-create function cms_permission__has_revoke_authority (integer,integer,varchar,integer)
+create or replace function cms_permission__has_revoke_authority (integer,integer,varchar,integer)
returns boolean as '
declare
p_item_id alias for $1;
@@ -364,7 +364,7 @@
);
insert into v_items (value) values ('{0}');
-create function v_items_tr () returns opaque as '
+create or replace function v_items_tr () returns opaque as '
begin
raise EXCEPTION ''Only updates are allowed on this table'';
return null;
@@ -379,7 +379,7 @@
);
insert into v_perms (value) values ('{''}');
-create function v_perms_tr () returns opaque as '
+create or replace function v_perms_tr () returns opaque as '
begin
raise EXCEPTION ''Only updates are allowed on this table'';
return null;
@@ -391,7 +391,7 @@
-- procedure grant_permission
-- FIXME: need to fix problem with defined types
-create function cms_permission__grant_permission (integer,integer,varchar,integer,varchar)
+create or replace function cms_permission__grant_permission (integer,integer,varchar,integer,varchar)
returns integer as '
declare
p_item_id alias for $1;
@@ -480,7 +480,7 @@
-- procedure revoke_permission
-create function cms_permission__revoke_permission (integer,integer,varchar,integer,varchar)
+create or replace function cms_permission__revoke_permission (integer,integer,varchar,integer,varchar)
returns integer as '
declare
p_item_id alias for $1;
@@ -576,7 +576,7 @@
-- function permission_p
-create function cms_permission__permission_p (integer,integer,varchar)
+create or replace function cms_permission__permission_p (integer,integer,varchar)
returns boolean as '
declare
p_item_id alias for $1;
@@ -660,7 +660,7 @@
end;' language 'plpgsql';
-create function cms_permission__cm_admin_exists() returns boolean as '
+create or replace function cms_permission__cm_admin_exists() returns boolean as '
declare
v_exists boolean;
begin
@@ -685,7 +685,7 @@
-- A trigger to automatically grant item creators the cm_write and cm_perm
-- permissions
-create function cr_items_permission_tr () returns opaque as '
+create or replace function cr_items_permission_tr () returns opaque as '
declare
v_user_id parties.party_id%TYPE;
begin
@@ -801,7 +801,7 @@
-- create or replace package body content_permission
-- procedure inherit_permissions
-create function content_permission__inherit_permissions (integer,integer,integer)
+create or replace function content_permission__inherit_permissions (integer,integer,integer)
returns integer as '
declare
p_parent_object_id alias for $1;
@@ -814,7 +814,7 @@
-- function has_grant_authority
-create function content_permission__has_grant_authority (integer,integer,varchar)
+create or replace function content_permission__has_grant_authority (integer,integer,varchar)
returns boolean as '
declare
p_object_id alias for $1;
@@ -829,7 +829,7 @@
-- procedure grant_permission_h
-create function content_permission__grant_permission_h (integer,integer,varchar)
+create or replace function content_permission__grant_permission_h (integer,integer,varchar)
returns integer as '
declare
p_object_id alias for $1;
@@ -841,7 +841,7 @@
-- procedure grant_permission
-create function content_permission__grant_permission (integer,integer,varchar,integer,varchar,varchar)
+create or replace function content_permission__grant_permission (integer,integer,varchar,integer,varchar,varchar)
returns integer as '
declare
p_object_id alias for $1;
@@ -860,7 +860,7 @@
-- function has_revoke_authority
-create function content_permission__has_revoke_authority (integer,integer,varchar,integer)
+create or replace function content_permission__has_revoke_authority (integer,integer,varchar,integer)
returns boolean as '
declare
p_object_id alias for $1;
@@ -876,7 +876,7 @@
-- procedure revoke_permission_h
-create function content_permission__revoke_permission_h (integer,integer,varchar)
+create or replace function content_permission__revoke_permission_h (integer,integer,varchar)
returns integer as '
declare
p_object_id alias for $1;
@@ -888,7 +888,7 @@
-- procedure revoke_permission
-create function content_permission__revoke_permission (integer,integer,varchar,integer,varchar,varchar)
+create or replace function content_permission__revoke_permission (integer,integer,varchar,integer,varchar,varchar)
returns integer as '
declare
p_object_id alias for $1;
@@ -907,7 +907,7 @@
-- function permission_p
-create function content_permission__permission_p (integer,integer,varchar)
+create or replace function content_permission__permission_p (integer,integer,varchar)
returns boolean as '
declare
p_object_id alias for $1;
Index: openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql 30 Nov 2002 17:29:02 -0000 1.9
+++ openacs-4/packages/cms/sql/postgresql/cms-publishing-wf.sql 17 May 2003 10:22:35 -0000 1.10
@@ -6,7 +6,7 @@
references wf_cases
);
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
declare
v_workflow_key varchar(100);
@@ -244,7 +244,7 @@
-- create or replace package body publishing_wf as
-- function is_next
-create function publishing_wf__is_next (integer,varchar,varchar,varchar,varchar,varchar)
+create or replace function publishing_wf__is_next (integer,varchar,varchar,varchar,varchar,varchar)
returns char as '
declare
p_case_id alias for $1;
@@ -268,7 +268,7 @@
end;' language 'plpgsql';
-create function inline_2 ()
+create or replace function inline_2 ()
returns integer as '
declare
v_attribute_id acs_attributes.attribute_id%TYPE;
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 -N -r1.3 -r1.4
--- openacs-4/packages/cms/sql/postgresql/cms-update.sql 22 May 2001 22:46:13 -0000 1.3
+++ openacs-4/packages/cms/sql/postgresql/cms-update.sql 17 May 2003 10:22:35 -0000 1.4
@@ -1,6 +1,6 @@
-- Modify permissions to include the cm_relate permission
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
declare
v_exists integer;
@@ -33,7 +33,7 @@
-- This parent_id column was not included in the cr_keywords table
-- for RC 0. Ensure this column is there.
-create function inline_1 ()
+create or replace function inline_1 ()
returns integer as '
begin
@@ -63,7 +63,7 @@
-- show errors
-- Drop the broken trigger, if any
-create function inline_2 ()
+create or replace function inline_2 ()
returns integer as '
begin
-- FIXME: DCW - can''t locate where this trigger is created. Need a table
Index: openacs-4/packages/cms/sql/postgresql/cms-widgets.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-widgets.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/sql/postgresql/cms-widgets.sql 8 Jun 2001 01:44:53 -0000 1.4
+++ openacs-4/packages/cms/sql/postgresql/cms-widgets.sql 17 May 2003 10:22:35 -0000 1.5
@@ -3,7 +3,7 @@
/* insert form widgets and params */
-create function inline_0 ()
+create or replace function inline_0 ()
returns integer as '
begin
@@ -94,7 +94,7 @@
-- show errors
-create function inline_1 ()
+create or replace function inline_1 ()
returns integer as '
begin
@@ -123,7 +123,7 @@
-create function inline_2 ()
+create or replace function inline_2 ()
returns integer as '
begin
@@ -188,7 +188,7 @@
/* Register attribute widgets for content_revision and image */
-create function inline_3 ()
+create or replace function inline_3 ()
returns integer as '
begin
-- register form widgetes for content revision attributes
@@ -302,7 +302,7 @@
-create function inline_4 ()
+create or replace function inline_4 ()
returns integer as '
begin
Index: openacs-4/packages/cms/sql/postgresql/cms-workflow.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/cms-workflow.sql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/cms/sql/postgresql/cms-workflow.sql 21 Dec 2002 22:29:41 -0000 1.12
+++ openacs-4/packages/cms/sql/postgresql/cms-workflow.sql 17 May 2003 10:22:35 -0000 1.13
@@ -340,7 +340,7 @@
-- create or replace package body content_workflow
-- function is_overdue
-create function content_workflow__is_overdue (integer)
+create or replace function content_workflow__is_overdue (integer)
returns boolean as '
declare
p_task_id alias for $1;
@@ -368,7 +368,7 @@
-- function is_overdue
-create function content_workflow__is_overdue (integer,varchar)
+create or replace function content_workflow__is_overdue (integer,varchar)
returns boolean as '
declare
p_case_id alias for $1;
@@ -393,7 +393,7 @@
-- function get_holding_user_name
-create function content_workflow__get_holding_user_name (integer)
+create or replace function content_workflow__get_holding_user_name (integer)
returns varchar as '
declare
p_task_id alias for $1;
@@ -417,7 +417,7 @@
-create function content_workflow__get_first_place() returns varchar as '
+create or replace function content_workflow__get_first_place() returns varchar as '
declare
v_first_place wf_places.place_key%TYPE;
begin
@@ -441,7 +441,7 @@
end;' language 'plpgsql';
-- function get_this_place
-create function content_workflow__get_this_place (varchar)
+create or replace function content_workflow__get_this_place (varchar)
returns varchar as '
declare
p_transition_key alias for $1;
@@ -470,7 +470,7 @@
-- function get_next_place
-create function content_workflow__get_next_place (varchar)
+create or replace function content_workflow__get_next_place (varchar)
returns varchar as '
declare
p_transition_key alias for $1;
@@ -505,7 +505,7 @@
-- function get_previous_place
-create function content_workflow__get_previous_place (varchar)
+create or replace function content_workflow__get_previous_place (varchar)
returns varchar as '
declare
p_transition_key alias for $1;
@@ -540,7 +540,7 @@
-- procedure checkout
-create function content_workflow__checkout (integer,timestamp with time zone,integer,varchar,varchar)
+create or replace function content_workflow__checkout (integer,timestamptz,integer,varchar,varchar)
returns integer as '
declare
p_task_id alias for $1;
@@ -634,7 +634,7 @@
-- procedure checkin
-create function content_workflow__checkin (integer,integer,varchar,varchar)
+create or replace function content_workflow__checkin (integer,integer,varchar,varchar)
returns integer as '
declare
p_task_id alias for $1;
@@ -694,7 +694,7 @@
-- procedure approve
-create function content_workflow__approve (integer,integer,varchar,varchar)
+create or replace function content_workflow__approve (integer,integer,varchar,varchar)
returns integer as '
declare
p_task_id alias for $1;
@@ -770,7 +770,7 @@
-- procedure reject
-create function content_workflow__reject (integer,integer,varchar,varchar,varchar)
+create or replace function content_workflow__reject (integer,integer,varchar,varchar,varchar)
returns integer as '
declare
p_task_id alias for $1;
@@ -877,7 +877,7 @@
-- procedure notify_of_checkout
-create function content_workflow__notify_of_checkout (integer,integer,integer,varchar)
+create or replace function content_workflow__notify_of_checkout (integer,integer,integer,varchar)
returns integer as '
declare
p_task_id alias for $1;
@@ -937,7 +937,7 @@
-- function can_reject
-create function content_workflow__can_reject (integer,integer)
+create or replace function content_workflow__can_reject (integer,integer)
returns boolean as '
declare
p_task_id alias for $1;
@@ -965,7 +965,7 @@
-- function can_approve
-create function content_workflow__can_approve (integer,integer)
+create or replace function content_workflow__can_approve (integer,integer)
returns boolean as '
declare
p_task_id alias for $1;
@@ -989,7 +989,7 @@
-- function can_start
-create function content_workflow__can_start (integer,integer)
+create or replace function content_workflow__can_start (integer,integer)
returns boolean as '
declare
p_task_id alias for $1;
@@ -1013,7 +1013,7 @@
-- function approve_string
-create function content_workflow__approve_string (integer,integer)
+create or replace function content_workflow__approve_string (integer,integer)
returns varchar as '
declare
p_task_id alias for $1;
@@ -1049,7 +1049,7 @@
-- function count_finished_tasks
-create function content_workflow__count_finished_tasks (integer)
+create or replace function content_workflow__count_finished_tasks (integer)
returns integer as '
declare
p_case_id alias for $1;
@@ -1086,7 +1086,7 @@
-- function count_unfinished_tasks
-create function content_workflow__count_unfinished_tasks (integer)
+create or replace function content_workflow__count_unfinished_tasks (integer)
returns integer as '
declare
p_case_id alias for $1;
@@ -1114,7 +1114,7 @@
-- function is_active
-create function content_workflow__is_active (integer,varchar)
+create or replace function content_workflow__is_active (integer,varchar)
returns boolean as '
declare
p_case_id alias for $1;
@@ -1136,7 +1136,7 @@
-- function is_finished
-create function content_workflow__is_finished (integer,varchar)
+create or replace function content_workflow__is_finished (integer,varchar)
returns boolean as '
declare
p_case_id alias for $1;
@@ -1186,7 +1186,7 @@
-- function is_checked_out
-create function content_workflow__is_checked_out (integer,varchar)
+create or replace function content_workflow__is_checked_out (integer,varchar)
returns boolean as '
declare
p_case_id alias for $1;
@@ -1209,7 +1209,7 @@
-- function is_checked_out
-create function content_workflow__is_checked_out (integer,varchar,integer)
+create or replace function content_workflow__is_checked_out (integer,varchar,integer)
returns boolean as '
declare
p_case_id alias for $1;
@@ -1235,7 +1235,7 @@
-- function get_status
-create function content_workflow__get_status (integer,varchar)
+create or replace function content_workflow__get_status (integer,varchar)
returns varchar as '
declare
p_case_id alias for $1;
@@ -1283,7 +1283,7 @@
-- function can_touch
-create function content_workflow__can_touch (integer,integer)
+create or replace function content_workflow__can_touch (integer,integer)
returns boolean as '
declare
p_item_id alias for $1;
@@ -1342,7 +1342,7 @@
-- function unfinished_workflow_exists
-create function content_workflow__unfinished_workflow_exists (integer)
+create or replace function content_workflow__unfinished_workflow_exists (integer)
returns boolean as '
declare
p_item_id alias for $1;
Index: openacs-4/packages/cms/sql/postgresql/rel-test.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/rel-test.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/sql/postgresql/rel-test.sql 22 May 2001 04:44:57 -0000 1.2
+++ openacs-4/packages/cms/sql/postgresql/rel-test.sql 17 May 2003 10:22:35 -0000 1.3
@@ -18,7 +18,7 @@
check (direction in ('in', 'out'))
);
-create function inline_0 () returns integer as '
+create or replace function inline_0 () returns integer as '
declare
attr_id integer;
begin
@@ -95,7 +95,7 @@
weight_b integer not null
);
-create function inline_1 () returns integer as '
+create or replace function inline_1 () returns integer as '
declare
attr_id integer;
begin
Index: openacs-4/packages/cms/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql 17 May 2003 10:22:50 -0000 1.2
@@ -0,0 +1,146 @@
+-- DRB: Needed because workflow views were dependent on the party_approved_member_map
+-- view (which is now a table) and because PG doesn't support CREATE OR REPLACE VIEW.
+
+-- function permission_p
+create or replace function cms_permission__permission_p (integer,integer,varchar)
+returns boolean as '
+declare
+ p_item_id alias for $1;
+ p_holder_id alias for $2;
+ p_privilege alias for $3;
+ v_workflow_count integer;
+ v_task_count integer;
+begin
+
+ -- Check permission the old-fashioned way first
+ if acs_permission__permission_p (
+ p_item_id, p_holder_id, p_privilege
+ ) = ''f''
+ then
+ return ''f'';
+ end if;
+
+ -- Special case for workflow
+
+ if p_privilege = ''cm_relate'' or
+ p_privilege = ''cm_write'' or
+ p_privilege = ''cm_new''
+ then
+
+ -- Check if the publishing workflow exists, and if it
+ -- is the only workflow that exists
+ select
+ count(case_id) into v_workflow_count
+ from
+ wf_cases
+ where
+ object_id = p_item_id;
+
+ -- If there are multiple workflows / no workflows, do nothing
+ -- special
+ if v_workflow_count <> 1 then
+ return ''t'';
+ end if;
+
+ -- Even if there is a workflow, the user can touch the item if he
+ -- has cm_item_workflow
+ if acs_permission__permission_p (
+ p_item_id, p_holder_id, ''cm_item_workflow''
+ ) = ''t''
+ then
+ return ''t'';
+ end if;
+
+ -- Check if the user holds the current task
+ if v_workflow_count = 0 then
+ return ''f'';
+ end if;
+
+ select
+ count(task_id) into v_task_count
+ from
+ wf_user_tasks t, wf_cases c
+ where
+ t.case_id = c.case_id
+ and
+ c.workflow_key = ''publishing_wf''
+ and
+ c.state = ''active''
+ and
+ c.object_id = p_item_id
+ and
+ ( t.state = ''enabled''
+ or
+ ( t.state = ''started'' and t.holding_user = p_holder_id ))
+ and
+ t.user_id = p_holder_id;
+
+ -- is the user assigned a current task on this item
+ if v_task_count = 0 then
+ return ''f'';
+ end if;
+
+ end if;
+
+ return ''t'';
+
+end;' language 'plpgsql';
+
+-- function can_touch
+create or replace function content_workflow__can_touch (integer,integer)
+returns boolean as '
+declare
+ p_item_id alias for $1;
+ p_user_id alias for $2;
+ v_workflow_count integer;
+ v_task_count integer;
+begin
+
+ -- cm_admin has highest precedence
+ if content_permission__permission_p(
+ p_item_id, p_user_id, ''cm_item_workflow'' ) = ''t'' then
+ return ''t'';
+ end if;
+
+ select
+ count(case_id) into v_workflow_count
+ from
+ wf_cases
+ where
+ object_id = p_item_id;
+
+ -- workflow must exist
+ if v_workflow_count = 0 then
+ return ''f'';
+ end if;
+
+ select
+ count(task_id) into v_task_count
+ from
+ wf_user_tasks t, wf_cases c
+ where
+ t.case_id = c.case_id
+ and
+ c.workflow_key = ''publishing_wf''
+ and
+ c.state = ''active''
+ and
+ c.object_id = p_item_id
+ and
+ ( t.state = ''enabled''
+ or
+ ( t.state = ''started'' and t.holding_user = p_user_id ))
+ and
+ t.user_id = p_user_id;
+
+
+ -- is the user assigned a current task on this item
+ if v_task_count = 0 then
+ return ''f'';
+ else
+ return ''t'';
+ end if;
+
+
+end;' language 'plpgsql';
+
Index: openacs-4/packages/cms/tcl/form-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-oracle.xql,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/cms/tcl/form-procs-oracle.xql 25 Sep 2002 04:22:52 -0000 1.15
+++ openacs-4/packages/cms/tcl/form-procs-oracle.xql 17 May 2003 10:23:15 -0000 1.16
@@ -159,7 +159,7 @@
begin
- :item_id := content_item.new( [join $params ","] );
+ :1 := content_item.new( [join $params ","] );
end;
@@ -186,8 +186,7 @@
update cr_revisions
- set filename ='[cr_create_content_file $item_id $revision_id $tmpfile]',
- content_length = [file size $tmpfile]
+ set filename =:file_path, content_length = :file_size
where revision_id = :revision_id
@@ -237,7 +236,7 @@
and
content_item.is_subclass(:content_type, c.child_type) = 't'
and
- content_item.is_valid_child(:parent_id, c.child_type) = 't'
+ content_item.is_valid_child(:parent_id, c.child_type, relation_tag) = 't'
@@ -277,8 +276,6 @@
) types
where
object_type = ancestor
- and
- attribute_name <> 'ldap dn'
order by type_order desc, sort_order
Index: openacs-4/packages/cms/tcl/form-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-postgresql.xql,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 30 Nov 2002 17:29:11 -0000 1.19
+++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 17 May 2003 10:23:15 -0000 1.20
@@ -182,14 +182,13 @@
-
+
update cr_revisions
- set content = '[set file_path [cr_create_content_file $item_id $revision_id $tmpfile]]',
- content_length = '[cr_file_size $file_path]'
+ set content = :file_path, content_length = :file_size
where revision_id = :revision_id
@@ -329,8 +328,6 @@
) types
where
object_type = ancestor
- and
- attribute_name <> 'ldap dn'
order by type_order desc, sort_order
Index: openacs-4/packages/cms/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/cms/tcl/form-procs.tcl 18 Sep 2002 03:58:40 -0000 1.21
+++ openacs-4/packages/cms/tcl/form-procs.tcl 17 May 2003 10:23:15 -0000 1.22
@@ -1,202 +1,202 @@
namespace eval content {
- # namespace import seems to prevent content:: procs from being recognized
- # namespace import ::template::query ::template::form ::template::element
+ # namespace import seems to prevent content:: procs from being recognized
+ # namespace import ::template::query ::template::form ::template::element
}
-ad_proc -public content::query_form_metadata {
- {datasource_name rows} {datasource_type multirow} \
- {extra_where {}} {extra_orderby {}}
+ad_proc -private content::query_form_metadata {
+ {datasource_name rows}
+ {datasource_type multirow}
+ {extra_where {}}
+ {extra_orderby {}}
} {
-
- Helper proc: query out all the information neccessary to create
- a custom form element based on stored metadata
- Requires the variable content_type to be set in the calling frame
-
+ Helper proc: query out all the information neccessary to create
+ a custom form element based on stored metadata
+ Requires the variable content_type to be set in the calling frame
} {
+ # query for all attribute widget param values associated with a content
+ # the 3 nvl subqueries are necessary because we cannot outer join
+ # to more than one table without doing multiple subqueries (which is
+ # even less efficient than this way)
+ set query [db_map attributes_query_1]
+
+ if { ![template::util::is_nil extra_where] } {
+ append query [db_map attributes_query_extra_where]
+ }
- # query for all attribute widget param values associated with a content
- # the 3 nvl subqueries are necessary because we cannot outer join
- # to more than one table without doing multiple subqueries (which is
- # even less efficient than this way)
-
- set query [db_map attributes_query_1]
-
- if { ![template::util::is_nil extra_where] } {
- append query [db_map attributes_query_extra_where]
- }
-
- append query "
+ append query "
order by
attributes.tree_level, attributes.sort_order desc,
attributes.attribute_id, params.param_id"
-
- if { ![template::util::is_nil extra_orderby] } {
- append query ", $extra_orderby"
- }
- if [string equal $datasource_type multirow] {
- uplevel "db_multirow $datasource_name get_form_metadata \{$query\}"
- } else {
- uplevel "set $datasource_name [db_list_of_lists get_form_metadata {}]"
- }
+
+ if { ![template::util::is_nil extra_orderby] } {
+ append query ", $extra_orderby"
+ }
+ if [string equal $datasource_type multirow] {
+ uplevel "db_multirow $datasource_name get_form_metadata \{$query\}"
+ } else {
+ uplevel "set $datasource_name [db_list_of_lists get_form_metadata {}]"
+ }
}
-ad_proc -public content::assemble_form_element { datasource_ref the_attribute_name start_row {db {}}} {
+ad_proc -private content::assemble_form_element {
+ datasource_ref the_attribute_name start_row {db {}}
+} {
- Process the query and assemble the "element create..." statement
- PRE: uber-query has been run
- POST: html_params, code_params set; returns the index of the next
- available row
+ Process the query and assemble the "element create..." statement
+ PRE: uber-query has been run
+ POST: html_params, code_params set; returns the index of the next
+ available row
} {
- upvar "${datasource_ref}:rowcount" rowcount
- upvar code_params code_params
- upvar content_type content_type
- upvar opts opts
+ upvar "${datasource_ref}:rowcount" rowcount
+ upvar code_params code_params
+ upvar content_type content_type
+ upvar opts opts
- set code_params [list]
- set html_params [list]
+ set code_params [list]
+ set html_params [list]
- # Process the results of the query.
- for { set i $start_row } { $i <= $rowcount } { incr i } {
- upvar "${datasource_ref}:${i}" q_row
+ # Process the results of the query.
+ for { set i $start_row } { $i <= $rowcount } { incr i } {
+ upvar "${datasource_ref}:${i}" q_row
- if { ![string equal $q_row(attribute_name) $the_attribute_name] } {
- break
- }
+ if { ![string equal $q_row(attribute_name) $the_attribute_name] } {
+ break
+ }
- template::util::array_to_vars q_row
+ template::util::array_to_vars q_row
- content::get_revision_create_element
- }
- set last_row $i
+ content::get_revision_create_element
+ }
+ set last_row $i
- # All the neccessary variables should still be set
- get_element_default_params
+ # All the neccessary variables should still be set
+ get_element_default_params
- # eval the last "element create" string
- if { [llength $html_params] } {
- # widget has html parameters
- lappend code_params -html $html_params
- }
+ # eval the last "element create" string
+ if { [llength $html_params] } {
+ # widget has html parameters
+ lappend code_params -html $html_params
+ }
- # Append any other parameters directly to the element create statement
- foreach name {content_type revision_id item_id} {
- if { [info exists opts($name)] } {
- unset opts($name)
+ # Append any other parameters directly to the element create statement
+ foreach name {content_type revision_id item_id} {
+ if { [info exists opts($name)] } {
+ unset opts($name)
+ }
}
- }
- foreach name [array names opts] {
- lappend code_params "-${name}" $opts($name)
- }
+ foreach name [array names opts] {
+ lappend code_params "-${name}" $opts($name)
+ }
- return $last_row
+ return $last_row
}
ad_proc -public content::create_form_element {
form_name attribute_name args
} {
- Create a form widget based on the given attribute. Query parameters
- out of the database, override them with the passed-in parameters
- if they exist.
- If the -revision_id flag exists, fills in the value of the attribute from
- the database, based on the given revision_id.
- If the -content_type flag exists, uses the attribute for the given content
- type (without inheritance).
- If the -item_id flag is present, the live revision for the item will be
- used.
- If the -item_id and the -revision_id flags are missing, the -content_type
- flag must be specified.
- Example:
- content::create_form_element my_form width -revision_id $image_id -size 10
+ Create a form widget based on the given attribute. Query parameters
+ out of the database, override them with the passed-in parameters
+ if they exist.
+ If the -revision_id flag exists, fills in the value of the attribute from
+ the database, based on the given revision_id.
+ If the -content_type flag exists, uses the attribute for the given content
+ type (without inheritance).
+ If the -item_id flag is present, the live revision for the item will be
+ used.
+ If the -item_id and the -revision_id flags are missing, the -content_type
+ flag must be specified.
+ Example:
+ content::create_form_element my_form width -revision_id $image_id -size 10
This call will create an element representing the width attribute
of the image type, with the textbox size set to 10 characters,
and query the current value of the attribute out of the database.
} {
- template::util::get_opts $args
+ template::util::get_opts $args
- # Get the revision id if the item id is specified, or if
- # it is passed in directly
- if { ![template::util::is_nil opts(revision_id)] } {
- set revision_id $opts(revision_id)
-
- } elseif { ![template::util::is_nil opts(item_id)] } {
-
- set item_id $opts(item_id)
- set revision_id [db_string get_revision_id ""]
- }
+ # Get the revision id if the item id is specified, or if
+ # it is passed in directly
+ if { ![template::util::is_nil opts(revision_id)] } {
+ set revision_id $opts(revision_id)
+
+ } elseif { ![template::util::is_nil opts(item_id)] } {
+
+ set item_id $opts(item_id)
+ set revision_id [db_string get_revision_id ""]
+ }
- if { [info exists opts(content_type)] } {
- # The type is known: use it
- set content_type $opts(content_type)
- } else {
-
- # Figure out the type based on revision_id
- if { ![info exists revision_id] } {
- template::request error invalid_element_flags "
+ if { [info exists opts(content_type)] } {
+ # The type is known: use it
+ set content_type $opts(content_type)
+ } else {
+
+ # Figure out the type based on revision_id
+ if { ![info exists revision_id] } {
+ template::request error invalid_element_flags "
No revision_id, item_id or content_type specified in
content::create_form_element for attribute ${form_name}:${attribute_name}"
- return
+ return
+ }
+
+ set content_type [db_string get_content_type ""]
}
-
- set content_type [db_string get_content_type ""]
- }
- # Run the gigantic uber-query. This is somewhat wasteful; should
- # be replaced by 2 smaller queries: one for the attribute_id, one
- # for parameter types and values.
- query_form_metadata params multirow "attribute_name = :attribute_name"
-
- if { ${params:rowcount} < 1} {
- error "No widgets are registered for ${content_type}.${attribute_name}"
- }
+ # Run the gigantic uber-query. This is somewhat wasteful; should
+ # be replaced by 2 smaller queries: one for the attribute_id, one
+ # for parameter types and values.
+ query_form_metadata params multirow "attribute_name = :attribute_name"
+
+ if { ${params:rowcount} < 1} {
+ error "No widgets are registered for ${content_type}.${attribute_name}"
+ }
- template::util::array_to_vars "params:1"
- assemble_form_element params $attribute_name 1
+ template::util::array_to_vars "params:1"
+ assemble_form_element params $attribute_name 1
- # If the -revision_id switch exists, look up the existing value for the
- # element
- if { ![template::util::is_nil revision_id] && [lsearch $code_params "-value"] < 0 } {
-
- # Handle custom datatypes... Basically, this is done so that
- # the date widget will work :-/
- # In the future, upgrade the date widget and use acs_object.get_attribute
+ # If the -revision_id switch exists, look up the existing value for the
+ # element
+ if { ![template::util::is_nil revision_id] && [lsearch $code_params "-value"] < 0 } {
+
+ # Handle custom datatypes... Basically, this is done so that
+ # the date widget will work :-/
+ # In the future, upgrade the date widget and use acs_object.get_attribute
- switch $datatype {
- date {
- set what [db_map cfe_attribute_name_to_char]
- }
+ switch $datatype {
+ date {
+ set what [db_map cfe_attribute_name_to_char]
+ }
- default {
- set what [db_map cfe_attribute_name]
- }
+ default {
+ set what [db_map cfe_attribute_name]
+ }
+ }
+
+ set element [db_string get_element_value ""]
+
+ lappend code_params -value $element_value -values [list $element_value]
}
-
- set element [db_string get_element_value ""]
- lappend code_params -value $element_value -values [list $element_value]
- }
+ set form_element "template::element create $form_name $attribute_name $code_params"
+ if { ![string equal $is_required t] } {
+ append form_element " -optional"
+ }
- set form_element "template::element create $form_name $attribute_name $code_params"
- if { ![string equal $is_required t] } {
- append form_element " -optional"
- }
-
- eval $form_element
+ eval $form_element
}
-
+
ad_proc -public content::get_revision_form {
- content_type item_id form_name {show_sections t} {element_override {}}
+ content_type item_id form_name {show_sections t} {element_override {}}
} {
- generate a form based on metadata
+ generate a form based on metadata
} {
@@ -244,10 +244,10 @@
lappend code_params -html $html_params
}
set form_element \
- "template::element create $form_name $last_attribute_name $code_params"
- #ns_log notice "*** CREATING..."
- #ns_log notice "*** ATTRIBUTE : $last_attribute_name"
- #ns_log notice "*** TYPE_LABEL : $last_type"
+ "template::element create $form_name $last_attribute_name $code_params"
+ ns_log notice "*** CREATING..."
+ ns_log notice "*** ATTRIBUTE : $last_attribute_name"
+ ns_log notice "*** TYPE_LABEL : $last_type"
eval $form_element
set code_params [list]
@@ -262,7 +262,7 @@
# evaluate the param
get_revision_create_element
if { [info exists overrides($last_attribute_name)] } {
- set code_params [concat $code_params $overrides($last_attribute_name)]
+ set code_params [concat $code_params $overrides($last_attribute_name)]
}
set last_attribute_name $attribute_name
@@ -277,46 +277,46 @@
}
set form_element "template::element create $form_name $last_attribute_name $code_params"
- #ns_log notice "***ELEMENT CREATE: $form_element"
+ ns_log notice "***ELEMENT CREATE: $form_element"
eval $form_element
# add some default form elements
eval template::element create $form_name content_type \
- -widget hidden -datatype keyword -value $content_type
+ -widget hidden -datatype keyword -value $content_type
if { ![string equal $item_id ""] } {
eval template::element create $form_name item_id \
- -widget hidden -datatype integer -value $item_id
+ -widget hidden -datatype integer -value $item_id
}
}
ad_proc -public content::get_element_default_params {} {
- PRE: requires datatype, widget, attribute_label, is_required code_params
- to be set in the calling frame
-
- POST: appends the list of params neccessary to create a new element to code_params
+ PRE: requires datatype, widget, attribute_label, is_required code_params
+ to be set in the calling frame
+
+ POST: appends the list of params neccessary to create a new element to code_params
} {
- uplevel {
- lappend code_params -datatype $datatype -widget $widget \
- -label $attribute_label
- if { [string equal $is_required "f"] } {
- lappend code_params -optional
+ uplevel {
+ lappend code_params -datatype $datatype -widget $widget \
+ -label $attribute_label
+ if { [string equal $is_required "f"] } {
+ lappend code_params -optional
+ }
}
- }
}
ad_proc content::get_revision_create_element {} {
- PRE: requires the following variables to be set in the uplevel scope:
- db, code_params, html_params,
- attribute_id, attribute_name, datatype, is_html,
- param_source, param_type, value
- POST: adds params to the 'element create' command
+ PRE: requires the following variables to be set in the uplevel scope:
+ db, code_params, html_params,
+ attribute_id, attribute_name, datatype, is_html,
+ param_source, param_type, value
+ POST: adds params to the 'element create' command
} {
upvar __sql sql
@@ -371,7 +371,7 @@
ad_proc -public content::process_revision_form { form_name content_type item_id {db{}} } {
- perform the appropriate DML based on metadata
+ perform the appropriate DML based on metadata
} {
@@ -402,8 +402,8 @@
upvar 0 "rows:${i}" row
template::util::array_to_vars row
- #ns_log notice "=========> $attribute_name"
- #ns_log notice "=========> $table_name"
+ ns_log notice "=========> $attribute_name"
+ ns_log notice "=========> $table_name"
if { ![string equal $last_table $table_name] } {
if { $i != 1 } {
@@ -416,18 +416,18 @@
# fetch the value of the attribute from the form
if { ![template::util::is_nil attribute_name] } {
set $attribute_name [template::element::get_value \
- $form_name $attribute_name]
+ $form_name $attribute_name]
lappend columns $attribute_name
# If the attribute is a date, get the date
if { [string equal $datatype date] } {
- set $attribute_name \
- [template::util::date::get_property sql_date [set $attribute_name]]
- # Can't use bind vars because this will be a to_date call
- lappend values "[set $attribute_name]"
+ set $attribute_name \
+ [template::util::date::get_property sql_date [set $attribute_name]]
+ # Can't use bind vars because this will be a to_date call
+ lappend values "[set $attribute_name]"
} else {
- lappend values ":$attribute_name"
+ lappend values ":$attribute_name"
}
}
set last_table $table_name
@@ -441,9 +441,9 @@
ad_proc -public content::process_revision_form_dml {} {
- helper function for process_revision_form
- PRE: the following variables must be set in the uplevel scope:
- columns, values, last_table
+ helper function for process_revision_form
+ PRE: the following variables must be set in the uplevel scope:
+ columns, values, last_table
} {
@@ -466,31 +466,31 @@
ad_proc -public content::insert_element_data {
- form_name content_type exclusion_list id_value \
- {suffix ""} {extra_where ""}
+ form_name content_type exclusion_list id_value \
+ {suffix ""} {extra_where ""}
} {
- Perform an insert for some form, adding all attributes of a
- specific type
- exclusion_list is a list of all object types for which the elements
+ Perform an insert for some form, adding all attributes of a
+ specific type
+ exclusion_list is a list of all object types for which the elements
are NOT to be inserted
- id_value is the revision_id
+ id_value is the revision_id
} {
set sql_exclusion [template::util::tcl_to_sql_list $exclusion_list]
set id_value_ref id_value
set query [db_map ied_get_objects_tree]
-
+
if { ![template::util::is_nil extra_where] } {
append query [db_map ied_get_objects_tree_extra_where]
}
append query [db_map ied_get_objects_tree_order_by]
- #ns_log notice "$query"
-
+ ns_log notice "insert_element_data: $query"
+
set last_table ""
set last_id_column ""
db_multirow rows insert_element_data $query
@@ -499,8 +499,8 @@
upvar 0 "rows:${i}" row
template::util::array_to_vars row
- # ns_log notice "=========> $attribute_name"
- # ns_log notice "=========> $table_name"
+ ns_log notice "=========> $attribute_name"
+ ns_log notice "=========> $table_name"
if { ![string equal $last_table $table_name] } {
if { $i != 1 } {
@@ -514,18 +514,18 @@
if { ![template::util::is_nil attribute_name] } {
set $attribute_name [template::element::get_value \
- $form_name "${attribute_name}${suffix}"]
+ $form_name "${attribute_name}${suffix}"]
lappend columns $attribute_name
# If the attribute is a date, get the date
if { [string equal $datatype date] } {
- set $attribute_name \
- [template::util::date::get_property sql_date [set $attribute_name]]
- # Can't use bind vars because this will be a to_date call
- lappend values "[set $attribute_name]"
+ set $attribute_name \
+ [template::util::date::get_property sql_date [set $attribute_name]]
+ # Can't use bind vars because this will be a to_date call
+ lappend values "[set $attribute_name]"
} else {
- lappend values ":$attribute_name"
+ lappend values ":$attribute_name"
}
}
set last_table $table_name
@@ -538,9 +538,9 @@
ad_proc -public content::process_insert_statement {} {
- helper function for process_revision_form
- PRE: the following variables must be set in the uplevel scope:
- columns, values, last_table, id_value_ref
+ helper function for process_revision_form
+ PRE: the following variables must be set in the uplevel scope:
+ columns, values, last_table, id_value_ref
} {
upvar last_table __last_table
@@ -562,49 +562,49 @@
ad_proc -public content::assemble_passthrough { args } {
- Assemble a passthrough list out of variables
+ Assemble a passthrough list out of variables
} {
- set result [list]
- foreach varname $args {
- upvar $varname var
- lappend result [list $varname $var]
- }
- return $result
+ set result [list]
+ foreach varname $args {
+ upvar $varname var
+ lappend result [list $varname $var]
+ }
+ return $result
}
ad_proc -public content::url_passthrough { passthrough } {
- Convert passthrough to a URL fragment
+ Convert passthrough to a URL fragment
} {
- set extra_url ""
- foreach pair $passthrough {
- append extra_url "&[lindex $pair 0]=[lindex $pair 1]"
- }
- return $extra_url
+ set extra_url ""
+ foreach pair $passthrough {
+ append extra_url "&[lindex $pair 0]=[lindex $pair 1]"
+ }
+ return $extra_url
}
ad_proc -public content::assemble_url { base_url args } {
- Assemble a URL out of component parts
+ Assemble a URL out of component parts
} {
- set result $base_url
- if { [string first $base_url "?"] == -1 } {
- set joiner "?"
- } else {
- set joiner "&"
- }
- foreach fragment $args {
- set fragment [string trimleft $fragment "&?"]
- if { ![string equal $fragment {}] } {
- append result $joiner $fragment
- set joiner "&"
+ set result $base_url
+ if { [string first $base_url "?"] == -1 } {
+ set joiner "?"
+ } else {
+ set joiner "&"
}
- }
- return $result
+ foreach fragment $args {
+ set fragment [string trimleft $fragment "&?"]
+ if { ![string equal $fragment {}] } {
+ append result $joiner $fragment
+ set joiner "&"
+ }
+ }
+ return $result
}
#################################################################
@@ -614,243 +614,294 @@
# Procedures for generating and processing content content creation
# and editing forms..
-ad_proc -public content::new_item { form_name { storage_type text } { tmpfile "" } } {
+ad_proc -public content::new_item { form_name { storage_type text } { tmpfile "" } {prefix {StArT}} } {
- Create a new item, including the initial revision, based on a valid
- form submission.
+ Create a new item, including the initial revision, based on a valid
+ form submission.
- @param form_name Name of the form from which to obtain item
- attributes, as well as attributes of the initial revision. The form
- should include an item_id, name and revision_id.
+ @param form_name Name of the form from which to obtain item
+ attributes, as well as attributes of the initial revision. The form
+ should include an item_id, name and revision_id.
- @param storage_type Method for storing content. Can be one of content_text,
- content_lob, content_file. This is an openacs extension for allowing the
- storage of content in the file-system.
+ @param storage_type Method for storing content. Can be one of content_text,
+ content_lob, content_file. This is an openacs extension for allowing the
+ storage of content in the file-system.
- @param tmpfile Name of the temporary file containing the content to
- upload for the initial revision.
+ @param tmpfile Name of the temporary file containing the content to
+ upload for the initial revision.
- @see content::add_revision
+ @param prefix A prefix to remove from the form when looking up attributes
+ @see content::add_revision
+
} {
+ # Here we walk the item prefixes and create them all, unless the content_prefixes var
+ # does not exist or we are already handling the form
+ ns_log Warning "JCD: handling prefix $prefix"
+ if {[string equal "StArT" $prefix]} {
+ if {[template::element exists $form_name content_prefixes]} {
+ foreach prefix [template::element get_value $form_name content_prefixes] {
+ lappend item_id [content::new_item $form_name $storage_type $tmpfile $prefix]
+ }
+ return $item_id
+ } else {
+ set prefix {}
+ }
+ }
+
+ if { [template::element exists $form_name ${prefix}item_id] } {
+ set item_id [template::element get_value $form_name ${prefix}item_id]
+ set exists [db_string item_id_exists "select count(*) from cr_items where item_id = :item_id"]
+ } else {
+ set exists 0
+ }
- array set defaults [list item_id "" locale "" parent_id "" content_type "content_revision"]
+ # If the item does not already exist build the call to create it.
+ if { !$exists } {
+ array set defaults [list item_id "" locale "" parent_id "" content_type "content_revision"]
- foreach param { item_id name locale parent_id content_type } {
+ foreach param { item_id name locale parent_id content_type } {
+
+ if { [template::element exists $form_name $prefix$param] } {
+ set $param [template::element get_value $form_name $prefix$param]
- if { [template::element exists $form_name $param] } {
- set $param [template::element get_value $form_name $param]
+ if { ! [string equal [set $param] {}] } {
+ # include the parameter if it is not null
+ # this for the oracle version, for postgres we just
+ # set param variables...
+ lappend params "$param => :$param"
+ }
+ } else {
+ set $param $defaults($param)
+ }
+ }
- if { ! [string equal [set $param] {}] } {
+ lappend params "creation_user => [User::getID]"
+ lappend params "creation_ip => '[ns_conn peeraddr]'"
+ lappend params "storage_type => :storage_type"
- # include the parameter if it is not null
- lappend params "$param => :$param"
- }
- } else {
- set $param $defaults($param)
+ # Use the correct relation tag, if specified
+ if { [template::element exists $form_name ${prefix}relation_tag] } {
+ set relation_tag [template::element get_value $form_name ${prefix}relation_tag]
+ lappend params "relation_tag => :relation_tag"
+ } else {
+ set relation_tag {}
+ }
}
- }
- lappend params "creation_user => [User::getID]"
- lappend params "creation_ip => '[ns_conn peeraddr]'"
- lappend params "storage_type => :storage_type"
-
- # Use the correct relation tag, if specified
- if { [template::element exists $form_name relation_tag] } {
- set relation_tag [template::element get_value $form_name relation_tag]
- lappend params "relation_tag => :relation_tag"
- }
-
- db_transaction {
-
- set item_id [db_exec_plsql get_item_id "
+ db_transaction {
+ if {!$exists} {
+ set item_id [db_exec_plsql get_item_id "
begin
:1 := content_item.new( [join $params ","] );
end;"]
+ }
+ add_revision $form_name $tmpfile $prefix [expr !$exists]
+ }
- add_revision $form_name $tmpfile
- }
+ # flush the sitemap folder listing cache
+ #if { [template::element exists $form_name parent_id] } {
+ # set parent_id [template::element get_value $form_name parent_id]
+ # if { $parent_id == [cm::modules::sitemap::getRootFolderID] } {
+ # set parent_id ""
+ # }
+ # cms_folder::flush sitemap $parent_id
+ #}
- # flush the sitemap folder listing cache
- #if { [template::element exists $form_name parent_id] } {
- # set parent_id [template::element get_value $form_name parent_id]
- # if { $parent_id == [cm::modules::sitemap::getRootFolderID] } {
- # set parent_id ""
- # }
- # cms_folder::flush sitemap $parent_id
- #}
-
- return $item_id
+ return $item_id
}
-ad_proc -public content::add_revision { form_name { tmpfile "" } } {
+ad_proc -public content::add_revision { form_name { tmpfile "" } {prefix {}} {new_p 1}} {
- Create a new revision for an existing item based on a valid form
- submission. Queries for attribute names and inserts a row into the
- attribute input view for the appropriate content type. Inserts the
- contents of a file into the content column of the cr_revisions table
- for the revision as well.
+ Create a new revision for an existing item based on a valid form
+ submission. Queries for attribute names and inserts a row into the
+ attribute input view for the appropriate content type. Inserts the
+ contents of a file into the content column of the cr_revisions table
+ for the revision as well.
- @param form_name Name of the form from which to obtain attribute
- values. The form should include an item_id and revision_id.
+ @param form_name Name of the form from which to obtain attribute
+ values. The form should include an item_id and revision_id.
- @param tmpfile Name of the temporary file containing the content to
- upload.
+ @param tmpfile Name of the temporary file containing the content to
+ upload.
+ @param prefix A prefix to prepend when looking up attributes in the form data
+
+ @param new_p Whether the revision is attached to a new cr_item or if previousrevision exist
} {
+ ns_log Debug "JCD: add_revision $form_name $tmpfile $prefix $new_p"
+ # initialize an ns_set to hold bind values
+ set bind_vars [ns_set create]
- # initialize an ns_set to hold bind values
- set bind_vars [ns_set create]
+ # get the item_id and revision_id and content_method
+ foreach var {item_id revision_id content_method} {
+ set $var [template::element get_values $form_name ${prefix}$var]
+ }
+ ns_set put $bind_vars item_id $item_id
+ ns_set put $bind_vars revision_id $revision_id
- # get the item_id and revision_id and content_method
- template::form get_values $form_name item_id revision_id content_method
- ns_set put $bind_vars item_id $item_id
- ns_set put $bind_vars revision_id $revision_id
+ # query for content_type and table_name
+ db_1row addrev_get_content_type "" -column_array info
- # query for content_type and table_name
- db_1row addrev_get_content_type "" -column_array info
+ set insert_statement [attribute_insert_statement \
+ $info(content_type) $info(table_name) $bind_vars $form_name $prefix $new_p]
- set insert_statement [attribute_insert_statement \
- $info(content_type) $info(table_name) $bind_vars $form_name]
+ # if content exists, prepare it for insertion
+ if { [template::element exists $form_name ${prefix}content] } {
+ set filename [template::element get_value $form_name ${prefix}content]
+ set tmpfile [prepare_content_file $form_name]
+ } else {
+ set filename ""
+ }
- # if content exists, prepare it for insertion
- if { [template::element exists $form_name content] } {
- set filename [template::element get_value $form_name content]
- set tmpfile [prepare_content_file $form_name]
- } else {
- set filename ""
- }
+ add_revision_dml $insert_statement $bind_vars $tmpfile $filename
- add_revision_dml $insert_statement $bind_vars $tmpfile $filename
-
- # flush folder listing for item's parent because title may have changed
- #template::query parent_id onevalue "
- # select parent_id from cr_items where item_id = :item_id"
- #
- # if { $parent_id == [cm::modules::sitemap::getRootFolderID] } {
- # set parent_id ""
- #}
- #cms_folder::flush sitemap $parent_id
+ # flush folder listing for item's parent because title may have changed
+ #template::query parent_id onevalue "
+ # select parent_id from cr_items where item_id = :item_id"
+ #
+ # if { $parent_id == [cm::modules::sitemap::getRootFolderID] } {
+ # set parent_id ""
+ #}
+ #cms_folder::flush sitemap $parent_id
}
ad_proc -private content::attribute_insert_statement {
+ content_type table_name bind_vars form_name {prefix {}} {new_p 1}
+} {
- content_type table_name bind_vars form_name } {
+ Prepare the insert statement into the attribute input view for a new
+ revision (see the content repository documentation for details about
+ the view).
- Prepare the insert statement into the attribute input view for a new
- revision (see the content repository documentation for details about
- the view).
+ @param content_type The content type of the item for which a new
+ revision is being prepared.
- @param content_type The content type of the item for which a new
- revision is being prepared.
+ @param table_name The storage table of the content type.
- @param table_name The storage table of the content type.
+ @param bind_vars The name of an ns_set in which to store the
+ attribute values for the revision. (Typically
+ duplicates the contents of [ns_getform])
+
+ @param form_name The name of the ATS form object used to process the
+ submission.
- @param bind_vars The name of an ns_set in which to store the
- attribute values for the revision. (Typically duplicates the contents
- of [ns_getform].
-
- @param form_name The name of the ATS form object used to process the
- submission.
-
} {
+ # get creation_user and creation_ip
+ set creation_user [User::getID]
+ set creation_ip [ns_conn peeraddr]
+ ns_set put $bind_vars creation_user $creation_user
+ ns_set put $bind_vars creation_ip $creation_ip
- # get creation_user and creation_ip
- set creation_user [User::getID]
- set creation_ip [ns_conn peeraddr]
- ns_set put $bind_vars creation_user $creation_user
- ns_set put $bind_vars creation_ip $creation_ip
+ # initialize the column and value list
+ set columns [list item_id revision_id creation_user creation_ip]
+ set values [list :item_id :revision_id :creation_user :creation_ip]
+ set default_columns [list]
+ set default_values [list]
+ set missing_columns [list]
- # initialize the column and value list
- set columns [list item_id revision_id creation_user creation_ip]
- set values [list :item_id :revision_id :creation_user :creation_ip]
+ # query for attribute names and datatypes
+ foreach attribute [get_attributes $content_type attribute_name datatype default_value ancestor] {
- # query for attribute names and datatypes
- foreach attribute [get_attributes $content_type attribute_name datatype] {
+ foreach {attribute_name datatype default_value ancestor} $attribute { break }
- set attribute_name [lindex $attribute 0]
- set datatype [lindex $attribute 1]
+ # get the form value
+ if { [template::element exists $form_name $prefix$attribute_name] } {
- # get the form value
- if { [template::element exists $form_name $attribute_name] } {
+ set value [template::element get_value $form_name $prefix$attribute_name]
- set value [template::element get_value $form_name $attribute_name]
+ # Convert dates to linear "YYYY MM DD HH24 MI SS" format
+ if { [string equal $datatype date] } {
+ set value [template::util::date get_property linear_date $value]
+ foreach i {1 2} {
+ if {[string equal [lindex $value $i] "00"]} {
+ set value [lreplace $value $i $i 01]
+ }
+ }
+ }
+
+ if { ! [string equal $value {} ] } {
+ ns_set put $bind_vars $attribute_name $value
- # Convert dates to linear "YYYY MM DD HH24 MI SS" format
- if { [string equal $datatype date] } {
- set value [template::util::date get_property linear_date $value]
- }
-
- if { ! [string equal $value {} ] } {
-
- ns_set put $bind_vars $attribute_name $value
-
- lappend columns $attribute_name
- lappend values [get_sql_value $attribute_name $datatype]
- }
+ lappend columns $attribute_name
+ lappend values [get_sql_value $attribute_name $datatype]
+ }
+ } elseif { ![string equal $ancestor "acs_object"]
+ && ( ![string equal $ancestor "cr_revision"]
+ || [lsearch -exact {revision_id item_id publish_date} $attribute_name] == -1) } {
+ # We preserve attributes not in the form and not "special" like acs_object and some of cr_revision.
+ lappend missing_columns $attribute_name
+ if {$new_p && ![string equal $default_value {}]} {
+ ns_set put $bind_vars $attribute_name $default_value
+
+ lappend default_columns $attribute_name
+ lappend default_values [get_sql_value $attribute_name $datatype]
+ }
+ }
}
- }
+
+ if {$new_p} {
+ set insert_statement "insert into ${table_name}i ( [join [concat $columns $default_columns] ", "] )\nvalues ( [join [concat $values $default_values] ", "] )"
+ } else {
+ set insert_statement "insert into ${table_name}i ( [join [concat $columns $missing_columns] ", "] )\nselect [join [concat $values $missing_columns] ", "]\nfrom ${table_name}i\nwhere revision_id = content_item.get_latest_revision(:item_id)"
+ }
- set insert_statement "insert into ${table_name}i
- ( [join $columns ","] ) values ( [join $values ","] )"
-
- return $insert_statement
+ return $insert_statement
}
ad_proc -private content::add_revision_dml { statement bind_vars tmpfile filename } {
- Perform the DML to insert a revision into the appropriate input view.
+ Perform the DML to insert a revision into the appropriate input view.
- @param statement The DML for the insert statement, specifying a bind
- variable for each column value.
+ @param statement The DML for the insert statement, specifying a bind
+ variable for each column value.
- @param bind_vars An ns_set containing the values for all bind variables.
+ @param bind_vars An ns_set containing the values for all bind variables.
- @param tmpfile The server-side name of the file containing the body of the
- revision to upload into the content BLOB column of cr_revisions.
+ @param tmpfile The server-side name of the file containing the body of the
+ revision to upload into the content BLOB column of cr_revisions.
- @param filename The client-side name of the file containing the body of
- the revision to upload into the content BLOB column of cr_revisions
+ @param filename The client-side name of the file containing the body of
+ the revision to upload into the content BLOB column of cr_revisions
- @see content::add_revision
+ @see content::add_revision
} {
+ db_transaction {
- db_transaction {
+ db_dml add_revision $statement -bind $bind_vars
- db_dml add_revision $statement -bind $bind_vars
+ if { ![string equal $tmpfile {}] } {
- if { ![string equal $tmpfile {}] } {
-
- set revision_id [ns_set get $bind_vars revision_id]
- upload_content $revision_id $tmpfile $filename
-
- }
- }
+ set revision_id [ns_set get $bind_vars revision_id]
+ upload_content $revision_id $tmpfile $filename
+
+ }
+ }
}
ad_proc -public content::upload_content { revision_id tmpfile filename } {
- @private upload_content
+ @private upload_content
- Inserts content into the database from an uploaded file.
- Does automatic mime_type updating
- Parses text/html content and removes tags
+ Inserts content into the database from an uploaded file.
+ Does automatic mime_type updating
+ Parses text/html content and removes tags
- @param db A db handle
+ @param db A db handle
- @param revision_id The revision to which the content belongs
+ @param revision_id The revision to which the content belongs
- @param tmpfile The server-side name of the file containing the body of the
- revision to upload into the content BLOB column of cr_revisions.
+ @param tmpfile The server-side name of the file containing the body of the
+ revision to upload into the content BLOB column of cr_revisions.
- @param filename The client-side name of the file containing the body of
- the revision to upload into the content BLOB column of cr_revisions
+ @param filename The client-side name of the file containing the body of
+ the revision to upload into the content BLOB column of cr_revisions
} {
@@ -859,31 +910,29 @@
set mime_type [ns_guesstype $filename]
ns_log Notice "guessed mime_type: $mime_type, filename = $filename"
if { [string equal $mime_type text/html] } {
- set text [template::util::read_file $tmpfile]
- if { [regexp {]*>(.*?)
![\"[_](\"/shared/images/add.gif\")
"
+
# Depending on the view, make a different widget
if {$view == "day"} {
+
+ # Check that the previous and next days are in the tcl boundaries
+ # so that the calendar widget doesn't bomb when it creates the next/prev links
+ if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set previous_link ""
+ } else {
+ if {[catch {clock scan $yest}]} {
+ set previous_link ""
+ } else {
+ set previous_link "<"
+ }
+ }
+
+ if {[catch {set tomor [clock format [clock scan "1 day" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set next_link ""
+ } else {
+ if {[catch {clock scan $tomor}]} {
+ set next_link ""
+ } else {
+ set next_link ">"
+ }
+ }
+
set cal_stuff [calendar::one_day_display \
- -prev_nav_template "<" \
- -next_nav_template ">" \
+ -prev_nav_template $previous_link \
+ -next_nav_template $next_link \
-item_template $item_template \
-hour_template $hour_template \
-date $date -start_hour 7 -end_hour 22 \
@@ -40,25 +72,71 @@
}
if {$view == "week"} {
+
+ # Check that the previous and next weeks are in the tcl boundaries
+ # so that the calendar widget doesn't bomb when it creates the next/prev links
+ if {[catch {set prev_w [clock format [clock scan "1 week ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set previous_link ""
+ } else {
+ if {[catch {clock scan $prev_w}]} {
+ set previous_link ""
+ } else {
+ set previous_link "<"
+ }
+ }
+
+ if {[catch {set next_w [clock format [clock scan "1 week" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set next_link ""
+ } else {
+ if {[catch {clock scan $next_w}]} {
+ set next_link ""
+ } else {
+ set next_link ">"
+ }
+ }
+
set cal_stuff [calendar::one_week_display \
-item_template $item_template \
-day_template "\$day - \$pretty_date ([_ calendar.Add_Item])" \
-date $date \
-calendar_id_list $calendar_list \
- -prev_week_template "<" \
- -next_week_template ">"
- ]
+ -prev_week_template $previous_link \
+ -next_week_template $next_link]
+
}
if {$view == "month"} {
+
+ # Check that the previous and next months are in the tcl boundaries
+ # so that the calendar widget doesn't bomb when it creates the next/prev links
+ if {[catch {set prev_m [clock format [clock scan "1 month ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set previous_link ""
+ } else {
+ if {[catch {clock scan $prev_m}]} {
+ set previous_link ""
+ } else {
+ set previous_link "<"
+ }
+ }
+
+ if {[catch {set next_m [clock format [clock scan "1 month" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+ set next_link ""
+ } else {
+ if {[catch {clock scan $next_m}]} {
+ set next_link ""
+ } else {
+ set next_link ">"
+ }
+ }
+
set cal_stuff [calendar::one_month_display \
-item_template "$item_template" \
-day_template "\$day_number" \
-date $date \
-item_add_template "$item_add_template" \
-calendar_id_list $calendar_list \
- -prev_month_template "<" \
- -next_month_template ">"]
+ -prev_month_template $previous_link \
+ -next_month_template $next_link]
}
if {$view == "list"} {
Index: openacs-4/packages/chat/chat.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/chat.info 16 Jan 2003 13:45:37 -0000 1.3
+++ openacs-4/packages/chat/chat.info 17 May 2003 10:21:44 -0000 1.4
@@ -16,7 +16,7 @@