Index: openacs-4/packages/calendar/www/view-one-day-display-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-one-day-display-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/calendar/www/view-one-day-display-oracle.xql 9 Sep 2003 09:11:14 -0000 1.4 +++ openacs-4/packages/calendar/www/view-one-day-display-oracle.xql 25 Sep 2003 23:11:12 -0000 1.5 @@ -26,7 +26,6 @@ and ci.cal_item_id = e.event_id and to_char(start_date, 'HH24:MI') = '00:00' and to_char(end_date, 'HH24:MI') = '00:00' -and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id)) and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause @@ -54,16 +53,13 @@ and e.activity_id = a.activity_id and start_date between to_date(:current_date_system,:ansi_date_format) and - (to_date(:current_date_system,:ansi_date_format) + (24 - 1/3600)/24) + (to_date(:current_date_system,:ansi_date_format) + (:end_display_hour - 1/3600)/:end_display_hour) 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.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id)) and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause -$start_clause -$end_clause order by to_char(start_date,'HH24')