Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-oracle.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql	11 Aug 2003 12:14:15 -0000	1.9
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql	11 Dec 2003 21:39:59 -0000	1.10
@@ -18,58 +18,68 @@
 <fullquery name="calendar::item::get.select_item_data">      
 <querytext>
             
-            select   
-            cal_items.cal_item_id,
-            0 as n_attachments,
-            to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
-            to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-            nvl(e.name, a.name) as name,
-            nvl(e.description, a.description) as description,
-            recurrence_id,
-            cal_items.item_type_id,
-            cal_item_types.type as item_type,
-            on_which_calendar as calendar_id
-            from     acs_activities a,
-            acs_events e,
-            timespans s,
-            time_intervals t,
-            cal_items,
-            cal_item_types
-            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_item_id
-            and      cal_items.cal_item_id= :cal_item_id
-            and      cal_item_types.item_type_id(+)= cal_items.item_type_id
+            select cal_items.cal_item_id,
+                   0 as n_attachments,
+                   to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
+                   to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
+                   nvl(e.name, a.name) as name,
+                   nvl(e.description, a.description) as description,
+                   recurrence_id,
+                   cal_items.item_type_id,
+                   cal_item_types.type as item_type,
+                   on_which_calendar as calendar_id,
+                   c.calendar_name,
+                   o.creation_user
+            from   acs_activities a,
+                   acs_events e,
+                   timespans s,
+                   time_intervals t,
+                   cal_items,
+                   cal_item_types,
+                   calendars c,
+                   acs_objects o
+            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_item_id
+            and    cal_items.cal_item_id= :cal_item_id
+            and    cal_item_types.item_type_id(+)= cal_items.item_type_id
+            and    c.calendar_id = on_which_calendar
+            and    o.object_id = cal_items.cal_item_id
 </querytext>
 </fullquery>
 
 <fullquery name="calendar::item::get.select_item_data_with_attachment">      
 <querytext>
             
-            select   
-            cal_items.cal_item_id,
-            (select count(*) from attachments where object_id = cal_item_id) as n_attachments,
-            to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
-            to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-            nvl(e.name, a.name) as name,
-            nvl(e.description, a.description) as description,
-            recurrence_id,
-            cal_items.item_type_id,
-            cal_item_types.type as item_type,
-            on_which_calendar as calendar_id
-            from     acs_activities a,
-            acs_events e,
-            timespans s,
-            time_intervals t,
-            cal_items,
-            cal_item_types
-            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_item_id
-            and      cal_items.cal_item_id= :cal_item_id
-            and      cal_item_types.item_type_id(+)= cal_items.item_type_id
+            select cal_items.cal_item_id,
+                   (select count(*) from attachments where object_id = cal_item_id) as n_attachments,
+                   to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
+                   to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
+                   nvl(e.name, a.name) as name,
+                   nvl(e.description, a.description) as description,
+                   recurrence_id,
+                   cal_items.item_type_id,
+                   cal_item_types.type as item_type,
+                   on_which_calendar as calendar_id,
+                   c.calendar_name,
+                   o.creation_user
+            from   acs_activities a,
+                   acs_events e,
+                   timespans s,
+                   time_intervals t,
+                   cal_items,
+                   cal_item_types,
+                   calendars c,
+                   acs_objects o
+            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_item_id
+            and    cal_items.cal_item_id= :cal_item_id
+            and    cal_item_types.item_type_id(+)= cal_items.item_type_id
+            and    c.calendar_id = on_which_calendar
+            and    o.object_id = cal_items.cal_item_id
 </querytext>
 </fullquery>