Index: openacs-4/packages/calendar/www/cal-weekview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-weekview.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-weekview.tcl	6 Sep 2001 06:30:43 -0000	1.2
@@ -49,7 +49,7 @@
 select   to_char(start_date, 'J') as start_date,
          to_char(start_date, 'HH24:MI') as pretty_start_date,
          to_char(end_date, 'HH24:MI') as pretty_end_date,
-         nvl(e.name, a.name) as name,
+         coalesce(e.name, a.name) as name,
          e.event_id as item_id
 from     acs_activities a,
          acs_events e,
@@ -58,17 +58,41 @@
 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(:sunday_of_the_week,'YYYY-MM-DD') and 
+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 
+and      e.event_id
 in       (
          select  cal_item_id
          from    cal_items
          where   on_which_calendar = :calendar_id
          )
 "
 
+#set sql "
+#select   to_char(start_date, 'J') as start_date,
+#         to_char(start_date, 'HH24:MI') as pretty_start_date,
+#         to_char(end_date, 'HH24:MI') as pretty_end_date,
+#         nvl(e.name, a.name) as name,
+#         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(:sunday_of_the_week,'YYYY-MM-DD') and 
+#         to_date(:saturday_of_the_week,'YYYY-MM-DD')
+#and      e.event_id 
+#in       (
+#         select  cal_item_id
+#         from    cal_items
+#         where   on_which_calendar = :calendar_id
+#         )
+#"
+
 set mlist ""
 set set_id [ns_set new week_items]