Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql	25 Jul 2002 03:15:32 -0000	1.11
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql	18 Nov 2002 18:01:10 -0000	1.12
@@ -7,8 +7,8 @@
       <querytext>
       
 	select   to_char(start_date, 'j') as start_date,
-                 to_char(start_date, 'HH:MIpm') as start_time,
-                 to_char(end_date, 'HH:MIpm') as end_time,
+                 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,
 	         nvl(e.name, a.name) as name,
 	         nvl(e.description, a.description) as description,
                  nvl(e.status_summary, a.status_summary) as status_summary,
@@ -36,26 +36,13 @@
 </fullquery>
 
 
-<fullquery name="calendar::one_week_display.select_weekday_info">
-<querytext>
-        select   to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D') 
-        as       day_of_the_week,
-        to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'SUNDAY')) 
-        as       sunday_of_the_week,
-        to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday')) 
-        as       saturday_of_the_week
-        from     dual
-</querytext>
-</fullquery>
-
-
 <fullquery name="calendar::one_week_display.select_week_items">
 <querytext>
 select   to_char(start_date, 'J') as start_date_julian,
-         to_char(start_date, 'HH:MIpm') as pretty_start_date,
-         to_char(end_date, 'HH:MIpm') as pretty_end_date,
          to_char(start_date,'HH24:MI') as start_date,
          to_char(end_date,'HH24:MI') as end_date,
+         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,
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
@@ -72,10 +59,9 @@
 where    e.timespan_id = s.timespan_id
 and      s.interval_id = t.interval_id
 and      e.activity_id = a.activity_id
-and     e.event_id = cal_items.cal_item_id       
-and      start_date between
-         to_date(:sunday_of_the_week,'YYYY-MM-DD') and
-         to_date(:saturday_of_the_week,'YYYY-MM-DD')
+and      e.event_id = cal_items.cal_item_id       
+and      start_date >= to_date(:first_day_of_week_julian, 'J') 
+and      start_date <= to_date(:first_day_of_week_julian + 7, 'J')
 and      e.event_id
 in       (
          select  cal_item_id
@@ -89,10 +75,10 @@
 <fullquery name="calendar::one_day_display.select_day_items">
 <querytext>
 	select   to_char(start_date, 'HH24') as start_hour,
-         to_char(start_date, 'HH:MIpm') as pretty_start_date,
-         to_char(end_date, 'HH:MIpm') as pretty_end_date,
          to_char(start_date, 'HH24:MI') as start_date,
          to_char(end_date, 'HH24:MI') as end_date,
+         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,
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
@@ -126,10 +112,8 @@
 <fullquery name="calendar::list_display.select_list_items">
 <querytext>
 	select   to_char(start_date, 'HH24') as start_hour,
-         to_char(start_date, 'MM/DD/YYYY') as pretty_date,
-         to_char(start_date, 'Day') as pretty_weekday,
-         to_char(start_date, 'HH:MIpm') as pretty_start_date,
-         to_char(end_date, 'HH:MIpm') as pretty_end_date,
+         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,
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
@@ -155,34 +139,5 @@
 order by $sort_by	
 </querytext>
 </fullquery>
-
-
-<fullquery name="calendar::list_display.select_day_items">
-<querytext>
-	select   to_char(start_date, 'HH24') as start_hour,
-         to_char(start_date, 'HH:MIpm') as pretty_start_date,
-         to_char(end_date, 'HH:MIpm') as pretty_end_date,
-         nvl(e.name, a.name) as name,
-         nvl(e.status_summary, a.status_summary) as status_summary,
-         e.event_id as item_id
-from     acs_activities a,
-         acs_events e,
-         timespans s,
-         time_intervals t
-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,:date_format) and
-         to_date(:current_date,:date_format) + (24 - 1/3600)/24
-and      e.event_id
-in       (
-         select  cal_item_id
-         from    cal_items
-         where   on_which_calendar = :calendar_id
-         )
-	
-</querytext>
-</fullquery>
  
 </queryset>