Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	13 Aug 2003 16:08:33 -0000	1.11
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	11 Dec 2003 21:39:59 -0000	1.12
@@ -19,12 +19,14 @@
          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,
-         coalesce(a.name, e.name) as name,
+         coalesce(e.name, a.name) as name,
          coalesce(e.description, a.description) as description,
          recurrence_id,
          i.item_type_id,
          it.type as item_type,
-         on_which_calendar as calendar_id
+         on_which_calendar as calendar_id,
+         c.calendar_name,
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -36,6 +38,10 @@
            on (e.event_id = i.cal_item_id)
          left join cal_item_types it
            on (it.item_type_id = i.item_type_id)
+         left join calendars c
+           on (c.calendar_id = i.on_which_calendar)
+         left join acs_objects o
+           on (o.object_id = i.cal_item_id)
        where
          e.event_id = :cal_item_id
       </querytext>
@@ -53,7 +59,9 @@
          recurrence_id,
          i.item_type_id,
          it.type as item_type,
-         on_which_calendar as calendar_id
+         on_which_calendar as calendar_id,
+         c.calendar_name,
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -65,6 +73,10 @@
            on (e.event_id = i.cal_item_id)
          left join cal_item_types it
            on (it.item_type_id = i.item_type_id)
+         left join calendars c
+           on (c.calendar_id = i.on_which_calendar)
+         left join acs_objects o
+           on (o.object_id = i.cal_item_id)
        where
          e.event_id = :cal_item_id
      </querytext>