Index: openacs-4/packages/calendar/www/view-list-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-list-display-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/view-list-display-postgresql.xql	26 May 2003 10:00:10 -0000	1.1
+++ openacs-4/packages/calendar/www/view-list-display-postgresql.xql	21 Jul 2003 19:21:36 -0000	1.2
@@ -5,16 +5,21 @@
 
 <fullquery name="select_list_items">
 <querytext>
-	select   to_char(start_date, 'HH24') as start_hour,
+	select  
+         to_char(start_date, 'J') as julian_start_date,
+         to_char(start_date, 'HH24') as start_hour,
          to_char(start_date, 'YYYY-MM-DD') as pretty_start_date,
          to_char(start_date, 'HH24:MI:SS') as start_time,
-         to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date,
          to_char(end_date, 'YYYY-MM-DD') as pretty_end_date,
-         to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date,
+         to_char(start_date, 'HH24:MI') as pretty_start_time,
+         to_char(end_date, 'HH24:MI') as pretty_end_time,
          coalesce(e.name, a.name) as name,
          e.event_id as item_id,
          (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type,
-         to_char(start_date, 'Day') as pretty_weekday
+         to_char(start_date, 'Day') as pretty_weekday,
+	 on_which_calendar as calendar_id,
+	 (select calendar_name from calendars 
+	 where calendar_id = on_which_calendar) as calendar_name
 from     acs_activities a,
          acs_events e,
          timespans s,
@@ -24,14 +29,9 @@
 and      s.interval_id = t.interval_id
 and      e.activity_id = a.activity_id
 and      cal_items.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      (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)
+$calendar_where_clause
 order by $sort_by
 	
 </querytext>