Index: openacs-4/packages/calendar/www/views-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/views-oracle.xql	10 Jan 2004 00:19:03 -0000	1.1
+++ openacs-4/packages/calendar/www/views-oracle.xql	21 Jan 2004 11:41:11 -0000	1.2
@@ -7,14 +7,13 @@
 <querytext>
 	select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date,
          to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date,
-         trunc(start_date - to_date(:first_weekday_of_the_week_tz,
-         'YYYY-MM-DD HH24:MI:SS')) as day_of_week,
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
          (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type,
 	 cals.calendar_id,
 	 cals.calendar_name
+$additional_select_clause
 from     acs_activities a,
          acs_events e,
          timespans s,
@@ -24,12 +23,8 @@
 where    e.timespan_id = s.timespan_id
 and      s.interval_id = t.interval_id
 and      e.activity_id = a.activity_id
-and      start_date between
-         to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and
-         (to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + (:end_display_hour - 1/3600)/:end_display_hour)
+and      start_date between $interval_limitation_clause
 and      ci.cal_item_id = e.event_id
-and      (to_char(start_date, 'HH24:MI') <> '00:00' or
-          to_char(end_date, 'HH24:MI') <> '00:00')
 and      cals.calendar_id = ci.on_which_calendar
 and      e.event_id = ci.cal_item_id
 $additional_limitations_clause