Index: openacs-4/contrib/packages/events/tcl/events-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/tcl/events-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/tcl/events-procs-postgresql.xql 9 Mar 2003 12:07:42 -0000 1.1 +++ openacs-4/contrib/packages/events/tcl/events-procs-postgresql.xql 9 Mar 2003 16:26:59 -0000 1.2 @@ -59,7 +59,7 @@ select a.activity_id, aa.name, aa.description, e.display_after, v.city, v.usps_abbrev, v.venue_id, CASE WHEN to_char(t.start_date, 'YYYY-MM-DD') = to_char(t.end_date, 'YYYY-MM-DD') - THEN to_char(t.start_date, :date_format) || ' (' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :time_format) || ')' + THEN to_char(t.start_date, :date_format) || ' from ' || to_char(t.start_date, :time_format) || ' to ' || to_char(t.end_date, :time_format) ELSE to_char(t.start_date, :date_format) || ' ' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :date_format) || ' ' || to_char(t.end_date, :time_format) END as timespan, to_char(e.reg_deadline, :date_format) || ' ' || to_char(e.reg_deadline, :time_format) as reg_deadline, @@ -75,7 +75,20 @@ e.reg_cancellable_p, e.reg_needs_approval_p, e.contact_user_id, - coalesce(u.email, '') as contact_email + coalesce(u.email, '') as contact_email, + (select count(*) + from events_events ee2, + acs_events ae2, + timespans ts2, + time_intervals ti2 + where ee2.event_id != e.event_id + and ee2.available_p = 't' + and ae2.event_id = ee2.event_id + and ae2.activity_id = a.activity_id + and ts2.timespan_id = ae2.timespan_id + and ti2.interval_id = ts2.interval_id + and ti2.start_date > current_timestamp + ) as num_other_times from acs_events ae, acs_activities aa, events_activities a,