Index: openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 5 Sep 2003 08:55:15 -0000 1.14
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 22 Sep 2003 09:55:02 -0000 1.15
@@ -7,8 +7,8 @@
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,
coalesce(e.name, a.name) as name,
coalesce(e.description, a.description) as description,
coalesce(e.status_summary, a.status_summary) as status_summary,
@@ -71,25 +71,13 @@
-
-
- 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')- '1 week'::interval, 'Sunday'), 'YYYY-MM-DD')
- as sunday_of_the_week,
- to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday'), 'YYYY-MM-DD')
- as saturday_of_the_week
- from dual
-
-
-
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,
coalesce(e.name, a.name) as name,
coalesce(e.status_summary, a.status_summary) as status_summary,
e.event_id as item_id,
@@ -108,8 +96,8 @@
and e.activity_id = a.activity_id
and start_date between
to_date(:current_date,:date_format) and
- to_date(:current_date,:date_format) + cast('23 hours 59 minutes 59 seconds' as interval)
-and cal_items.cal_item_id= e.event_id
+ to_date(:current_date,:date_format) + (24 - 1/3600)/24
+and cal_items.cal_item_id= e.event_id
and e.event_id
in (
select cal_item_id
@@ -123,10 +111,8 @@
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,
coalesce(e.name, a.name) as name,
coalesce(e.status_summary, a.status_summary) as status_summary,
e.event_id as item_id,
@@ -153,6 +139,5 @@
-