Index: openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	1 Apr 2004 21:00:49 -0000	1.18
+++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql	19 Jun 2005 07:49:35 -0000	1.18.2.1
@@ -25,8 +25,7 @@
          it.type as item_type,
          on_which_calendar as calendar_id,
          c.calendar_name,
-         o.creation_user,
-         c.package_id as calendar_package_id
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -54,15 +53,14 @@
          (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,
-         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,
          c.calendar_name,
-         o.creation_user,
-         c.package_id as calendar_package_id
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -134,8 +132,8 @@
 	select cal_item__new (
 					null,
 					:calendar_id,
-					:name,
 					null,
+					null,
                                         null,
                                         null,
 					:timespan_id,