Index: openacs-4/packages/calendar/www/view-list-display-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-list-display-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/view-list-display-oracle.xql	11 Aug 2003 12:14:16 -0000	1.2
+++ openacs-4/packages/calendar/www/view-list-display-oracle.xql	9 Sep 2003 09:12:54 -0000	1.3
@@ -12,24 +12,21 @@
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
          recurrence_id,
-         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type
+         (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type
 from     acs_activities a,
          acs_events e,
          timespans s,
          time_intervals t,
-         cal_items
+         cal_items ci,
+         calendars cals
 where    e.timespan_id = s.timespan_id
 and      s.interval_id = t.interval_id
 and      e.activity_id = a.activity_id
-and      cal_items.cal_item_id= e.event_id
+and      ci.cal_item_id= e.event_id
 and      (start_date > to_date(:start_date,:date_format) or :start_date is null) and
          (start_date < to_date(:end_date,:date_format) or :end_date is null)
-and      e.event_id
-in       (
-         select  cal_item_id
-         from    cal_items
-         where   on_which_calendar = :calendar_id
-         )
+and      cals.calendar_id = ci.on_which_calendar
+$calendars_clause
 order by $sort_by	
 </querytext>
 </fullquery>