Index: openacs.org-dev/packages/calendar/tcl/calendar-display-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/calendar/tcl/calendar-display-procs-oracle.xql,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/calendar/tcl/calendar-display-procs-oracle.xql	9 Jul 2002 17:35:02 -0000	1.1.1.1
+++ openacs.org-dev/packages/calendar/tcl/calendar-display-procs-oracle.xql	25 Jul 2002 18:47:00 -0000	1.1.1.2
@@ -12,7 +12,11 @@
 	         nvl(e.name, a.name) as name,
 	         nvl(e.description, a.description) as description,
                  nvl(e.status_summary, a.status_summary) as status_summary,
-	         e.event_id as item_id
+	         e.event_id as item_id,
+		 (select on_which_calendar from cal_items where cal_item_id = e.event_id) as calendar_id,
+		 (select calendar_name from calendars 
+		 where calendar_id = (select on_which_calendar from cal_items where cal_item_id= e.event_id))
+		 as calendar_name
 	from     acs_activities a,
 	         acs_events e,
 	         timespans s,
@@ -24,7 +28,7 @@
 	in       (
 	         select  cal_item_id
 	         from    cal_items
-	         where   on_which_calendar = :calendar_id
+	         where   on_which_calendar in ([join $calendar_id_list ","])
          )
          order by start_date,end_date
 	
@@ -55,7 +59,11 @@
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
-         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type
+         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type,
+	 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,
@@ -72,7 +80,7 @@
 in       (
          select  cal_item_id
          from    cal_items
-         where   on_which_calendar = :calendar_id
+         where   on_which_calendar in ([join $calendar_id_list ","])
          )
 order by start_date
 </querytext>
@@ -88,7 +96,11 @@
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
-         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type
+         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type,
+	 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,
@@ -105,7 +117,7 @@
 in       (
          select  cal_item_id
          from    cal_items
-         where   on_which_calendar = :calendar_id
+         where   on_which_calendar in ([join $calendar_id_list ","])
          )
 	
 </querytext>