Index: openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql 9 Mar 2009 20:20:55 -0000 1.22 +++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql 23 Nov 2017 08:43:16 -0000 1.23 @@ -2,93 +2,7 @@ postgresql7.1 - - - select CASE WHEN :start_date::timestamptz <= :end_date::timestamptz - THEN 1 - ELSE -1 - END - - - - - select - i.cal_item_id, - 0 as n_attachments, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi, - coalesce(e.name, a.name) as name, - coalesce(e.description, a.description) as description, - recurrence_id, - i.item_type_id, - it.type as item_type, - on_which_calendar as calendar_id, - c.calendar_name, - o.creation_user, - c.package_id as calendar_package_id, - e.related_link_url, - e.related_link_text, - e.redirect_to_rel_link_p - from - acs_events e join timespans s - on (e.timespan_id = s.timespan_id) - join time_intervals t - on (s.interval_id = t.interval_id) - join acs_activities a - on (e.activity_id = a.activity_id) - join cal_items i - on (e.event_id = i.cal_item_id) - left join cal_item_types it - on (it.item_type_id = i.item_type_id) - left join calendars c - on (c.calendar_id = i.on_which_calendar) - left join acs_objects o - on (o.object_id = i.cal_item_id) - where - e.event_id = :cal_item_id - - - - - - select - i.cal_item_id, - (select count(*) from attachments where object_id = cal_item_id) as n_attachments, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi, - coalesce(e.name, a.name) as name, - coalesce(e.description, a.description) as description, - recurrence_id, - i.item_type_id, - it.type as item_type, - on_which_calendar as calendar_id, - c.calendar_name, - o.creation_user, - c.package_id as calendar_package_id, - e.related_link_url, - e.related_link_text, - e.redirect_to_rel_link_p - from - acs_events e join timespans s - on (e.timespan_id = s.timespan_id) - join time_intervals t - on (s.interval_id = t.interval_id) - join acs_activities a - on (e.activity_id = a.activity_id) - join cal_items i - on (e.event_id = i.cal_item_id) - left join cal_item_types it - on (it.item_type_id = i.item_type_id) - left join calendars c - on (c.calendar_id = i.on_which_calendar) - left join acs_objects o - on (o.object_id = i.cal_item_id) - where - e.event_id = :cal_item_id - - - select recurrence__new(:interval_type, @@ -199,52 +113,4 @@ - - - update acs_events set - [join $colspecs ", "] - where recurrence_id= :recurrence_id - and event_id in - (select e.event_id - from acs_events e, timespans t, time_intervals i - where e.recurrence_id = :recurrence_id - and t.timespan_id = e.timespan_id - and i.interval_id = t.interval_id - and (:edit_past_events_p = 't' - or i.start_date >= :start_date) - ) - - - - - - update cal_items - set [join $colspecs ", "] - where cal_item_id in (select e.event_id - from acs_events e, timespans t, time_intervals i - where e.recurrence_id = :recurrence_id - and t.timespan_id = e.timespan_id - and i.interval_id = t.interval_id - and (:edit_past_events_p = 't' - or i.start_date >= :start_date) - ) - - - - - - update acs_objects - set context_id = :calendar_id - where object_id in - (select e.event_id - from acs_events e, timespans t, time_intervals i - where e.recurrence_id = :recurrence_id - and t.timespan_id = e.timespan_id - and i.interval_id = t.interval_id - and (:edit_past_events_p = 't' - or i.start_date >= :start_date) - ) - - -