Index: openacs-4/packages/acs-events/acs-events.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/acs-events.info,v
diff -u -r1.32.2.6 -r1.32.2.7
--- openacs-4/packages/acs-events/acs-events.info 6 Mar 2024 18:03:34 -0000 1.32.2.6
+++ openacs-4/packages/acs-events/acs-events.info 19 Aug 2024 13:48:32 -0000 1.32.2.7
@@ -7,14 +7,14 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="0.6.2d7" url="http://openacs.org/repository/download/apm/acs-events-0.6.2d7.apm">
+ <version name="0.6.2d8" url="http://openacs.org/repository/download/apm/acs-events-0.6.2d8.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>API support for relationships between intervals in time, activities, and parties.</summary>
<release-date>2023-05-29</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">The events service is primarily intended for use by writers of application packages and other service packages. The service allows developers to specify and manipulate relationships (possibly recurring) between an object and another object.</description>
<maturity>2</maturity>
- <provides url="acs-events" version="0.6.2d7"/>
+ <provides url="acs-events" version="0.6.2d8"/>
<requires url="acs-kernel" version="5.10.1b1"/>
<callbacks>
Index: openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql 6 Mar 2024 18:03:35 -0000 1.27.2.1
+++ openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql 19 Aug 2024 13:48:32 -0000 1.27.2.2
@@ -1446,9 +1446,6 @@
--- added
-select define_function_args('acs_event__shift','event_id;null,start_offset;0,end_offset;0');
-
--
-- procedure acs_event__shift/3
--
@@ -1457,28 +1454,28 @@
-- @author W. Scott Meeks
--
-- @param event_id Event to shift.
- -- @param start_offset Adds this date interval to the
+ -- @param start_offset_interval Adds this date interval to the
-- start_dates of the timespan of the event.
-- No effect on any null start_date.
- -- @param end_offset Adds this date interval to the
+ -- @param end_offset_interval Adds this date interval to the
-- end_dates of the timespan of the event.
-- No effect on any null end_date.
--
-- @return 0 (procedure dummy)
CREATE OR REPLACE FUNCTION acs_event__shift(
shift__event_id integer, -- default null
- shift__start_offset interval, -- default 0
- shift__end_offset interval -- default 0
+ shift__start_offset_interval interval, -- default 0
+ shift__end_offset_interval interval -- default 0
) RETURNS integer AS $$
DECLARE
rec_events record;
BEGIN
-- update acs_events_dates
--- set start_date = start_date + shift__start_offset,
--- end_date = end_date + shift__end_offset
+-- set start_date = start_date + shift__start_offset_interval,
+-- end_date = end_date + shift__end_offset_interval
-- where event_id = shift__event_id;
-- Can not update view, so we do it the hard way
@@ -1491,8 +1488,8 @@
and s.interval_id = t.interval_id
loop
update time_intervals
- set start_date = start_date + shift__start_offset,
- end_date = end_date + shift__end_offset
+ set start_date = start_date + shift__start_offset_interval,
+ end_date = end_date + shift__end_offset_interval
where interval_id = rec_events.interval_id;
end loop;
@@ -1509,10 +1506,8 @@
--
-- Shifts the timespan of an event by the given offsets.
--
- -- JS: Overloaded function to make above compatible with Oracle behavior
- -- JS: when an integer (for number of days) is supplied as a parameter.
+ -- Overloaded function to make above compatible with Oracle behavior
--
- --
-- @param event_id Event to shift.
-- @param start_offset Adds this number of days to the
-- start_dates of the timespan of the event.
@@ -1523,6 +1518,8 @@
--
-- @return 0 (procedure dummy)
+select define_function_args('acs_event__shift','event_id;null,start_offset;0,end_offset;0');
+
CREATE OR REPLACE FUNCTION acs_event__shift(
shift__event_id integer, -- default null
shift__start_offset integer, -- default 0
@@ -1542,11 +1539,6 @@
$$ LANGUAGE plpgsql;
-
-
--- added
-select define_function_args('acs_event__shift_all','event_id;null,start_offset;0,end_offset;0');
-
--
-- procedure acs_event__shift_all/3
--
@@ -1557,19 +1549,19 @@
--
-- @param event_id All events with the same
-- recurrence_id as this one will be shifted.
- -- @param start_offset Adds this date interval to the
+ -- @param start_offset_inverval Adds this date interval to the
-- start_dates of the timespan of the event
-- instances. No effect on any null start_date.
- -- @param end_offset Adds this date interval to the
+ -- @param end_offset_inverval Adds this date interval to the
-- end_dates of the timespan of the event
-- instances. No effect on any null end_date.
--
-- @return 0 (procedure dummy)
CREATE OR REPLACE FUNCTION acs_event__shift_all(
shift_all__event_id integer, -- default null
- shift_all__start_offset interval, -- default 0
- shift_all__end_offset interval -- default 0
+ shift_all__start_offset_inverval interval, -- default 0
+ shift_all__end_offset_inverval interval -- default 0
) RETURNS integer AS $$
DECLARE
@@ -1578,8 +1570,8 @@
-- update acs_events_dates
--- set start_date = start_date + shift_all__start_offset,
--- end_date = end_date + shift_all__end_offset
+-- set start_date = start_date + shift_all__start_offset_inverval,
+-- end_date = end_date + shift_all__end_offset_inverval
-- where recurrence_id = (select recurrence_id
-- from acs_events
-- where event_id = shift_all__event_id);
@@ -1595,16 +1587,15 @@
PERFORM acs_event__shift(
rec_events.event_id,
- shift_all__start_offset,
- shift_all__end_offset
+ shift_all__start_offset_inverval,
+ shift_all__end_offset_inverval
);
end loop;
return 0;
END;
$$ LANGUAGE plpgsql;
--- end shift_all;
@@ -1616,7 +1607,6 @@
-- by the given offsets.
--
-- JS: Overloaded function to make above compatible with Oracle behavior
- -- JS: when an integer (for number of days) is supplied as a parameter.
--
--
-- @param event_id All events with the same
@@ -1630,6 +1620,8 @@
--
-- @return 0 (procedure dummy)
+select define_function_args('acs_event__shift_all','event_id;null,start_offset;0,end_offset;0');
+
CREATE OR REPLACE FUNCTION acs_event__shift_all(
shift_all__event_id integer, -- default null
shift_all__start_offset integer, -- default 0
Index: openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 29 May 2023 09:39:06 -0000 1.9.2.1
+++ openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 19 Aug 2024 13:48:32 -0000 1.9.2.2
@@ -185,9 +185,6 @@
--- added
-select define_function_args('time_interval__shift','interval_id,start_offset;0,end_offset;0');
-
--
-- procedure time_interval__shift/3
--
@@ -196,26 +193,26 @@
--
-- @author W. Scott Meeks
-- @param interval_id The interval to update.
- -- @param start_offset Adds this date interval to the
+ -- @param start_offset_intverval Adds this date interval to the
-- start_date of the interval. No effect if
-- start_date is null.
- -- @param end_offset Adds this date interval to the
+ -- @param end_offset_intverval Adds this date interval to the
-- end_date of the interval. No effect if
-- end_date is null.
--
-- @return 0 (procedure dummy)
--
CREATE OR REPLACE FUNCTION time_interval__shift(
shift__interval_id integer,
- shift__start_offset interval, -- default 0,
- shift__end_offset interval -- default 0
+ shift__start_offset_intverval interval, -- default 0,
+ shift__end_offset_intverval interval -- default 0
) RETURNS integer AS $$
DECLARE
BEGIN
update time_intervals
- set start_date = start_date + shift__start_offset,
- end_date = end_date + shift__end_offset
+ set start_date = start_date + shift__start_offset_intverval,
+ end_date = end_date + shift__end_offset_intverval
where interval_id = shift__interval_id;
return 0;
@@ -234,7 +231,6 @@
-- fractional days.
--
-- JS: Overloaded function to make above compatible with Oracle behavior
- -- JS: when an integer (for number of days) is supplied as a parameter.
--
-- @param interval_id The interval to update.
-- @param start_offset Adds this number of days to the
@@ -245,6 +241,9 @@
-- end_date is null.
--
-- @return 0 (procedure dummy)
+
+select define_function_args('time_interval__shift','interval_id,start_offset;0,end_offset;0');
+
CREATE OR REPLACE FUNCTION time_interval__shift(
shift__interval_id integer,
shift__start_offset integer, -- default 0,
@@ -266,8 +265,6 @@
--- added
-
--
-- procedure time_interval__overlaps_p/2
--
@@ -493,9 +490,6 @@
--- added
-select define_function_args('time_interval__copy','interval_id,offset;0');
-
--
-- procedure time_interval__copy/2
--
@@ -524,13 +518,13 @@
--
-- @author W. Scott Meeks
--
- -- @param interval_id Interval to copy
- -- @param offset Interval is offset by this date interval
+ -- @param interval_id Interval to copy
+ -- @param offset_interval Interval is offset by this date interval
--
-- @return interval_id of the copied interval
CREATE OR REPLACE FUNCTION time_interval__copy(
copy__interval_id integer,
- copy__offset interval -- default 0
+ copy__offset_interval interval -- default 0
) RETURNS integer AS $$
DECLARE
@@ -542,8 +536,8 @@
where interval_id = copy__interval_id;
return time_interval__new(
- (interval_row.start_date ::timestamp + copy__offset) :: timestamptz,
- (interval_row.end_date ::timestamp + copy__offset) :: timestamptz
+ (interval_row.start_date ::timestamp + copy__offset_interval) :: timestamptz,
+ (interval_row.end_date ::timestamp + copy__offset_interval) :: timestamptz
);
END;
@@ -597,6 +591,9 @@
--
-- @return interval_id of the copied interval
--
+
+select define_function_args('time_interval__copy','interval_id,offset;0');
+
CREATE OR REPLACE FUNCTION time_interval__copy(
copy__interval_id integer,
copy__offset integer -- default 0
@@ -675,8 +672,6 @@
--- added
-
--
-- procedure timespan__new/2
--
@@ -1146,8 +1141,6 @@
--- added
-
--
-- procedure timespan__overlaps_p/2
--
@@ -1245,9 +1238,6 @@
--- added
-select define_function_args('timespan__copy','timespan_id,offset');
-
--
-- procedure timespan__copy/2
--
@@ -1264,7 +1254,7 @@
--
CREATE OR REPLACE FUNCTION timespan__copy(
copy__timespan_id integer,
- copy__offset interval -- default 0
+ copy__offset_interval interval -- default 0
) RETURNS integer AS $$
DECLARE
@@ -1350,6 +1340,9 @@
--
-- @return Id of copied timespan
--
+
+select define_function_args('timespan__copy','timespan_id,offset');
+
CREATE OR REPLACE FUNCTION timespan__copy(
copy__timespan_id integer,
copy__offset integer
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-events/sql/postgresql/upgrade/upgrade-0.6.2d7-0.6.2d8.sql'.
Fisheye: No comparison available. Pass `N' to diff?