Index: openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql	14 May 2002 05:06:29 -0000	1.3
+++ openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql	3 Jun 2002 07:26:55 -0000	1.4
@@ -86,6 +86,7 @@
 	  on_which_calendar  => :on_which_calendar,
 	  activity_id        => :activity_id,
           timespan_id        => :timespan_id,
+          item_type_id        => :item_type_id,
 	  creation_user      => :creation_user,
 	  creation_ip        => :creation_ip
 	);
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	3 Jun 2002 04:08:17 -0000	1.4
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	3 Jun 2002 07:26:55 -0000	1.5
@@ -8,7 +8,7 @@
 
 
 <master src="master">
-<property name="title">Calendar Item Delete: @item_data.name@</property>
+<property name="title">Calendar Item Delete: @cal_item.name@</property>
 <property name="context_bar">Delete</property>
 
 <table>
@@ -21,17 +21,17 @@
 
     <td valign=top> 
     <table>
-    <tr><td colspan=2><blockquote>@item_data.description@</blockquote></td></tr>
-    <tr><th align=right>Date<if @item_data.no_time_p@ eq 0> and Time</if>:</th><td><a href="./?calendar_id=@calendar_id@&view=day&show_cal_nav=@show_cal_nav@&date=@raw_start_date@">@item_data.start_date@</a><if @item_data.no_time_p@ eq 0>, from @item_data.start_time@ to @item_data.end_time@</if></td></tr>
-    <tr><th align=right>Title:</th><td>@item_data.name@</td></tr>
-    <if @item_data.item_type@ not nil><tr><th align=right>Type:</th><td>@item_data.item_type@</td></tr></if>
+    <tr><td colspan=2><blockquote>@cal_item.description@</blockquote></td></tr>
+    <tr><th align=right>Date<if @cal_item.no_time_p@ eq 0> and Time</if>:</th><td><a href="./view?view=day&date=@cal_item.start_date@">@cal_item.pretty_short_start_date@</a><if @cal_item.no_time_p@ eq 0>, from @cal_item.start_time@ to @cal_item.end_time@</if></td></tr>
+    <tr><th align=right>Title:</th><td>@cal_item.name@</td></tr>
+    <if @cal_item.item_type@ not nil><tr><th align=right>Type:</th><td>@cal_item.item_type@</td></tr></if>
     </table>
     <p>
-<if @item_data.recurrence_id@ not nil>
+<if @cal_item.recurrence_id@ not nil>
 <b>This is a repeating event</b>. You may choose to:
 <ul>
 <li> <a href="cal-item-delete?cal_item_id=@cal_item_id@&confirm_p=1">delete only this instance</a>
-<li> <a href="cal-item-delete-all-occurrences?recurrence_id=@item_data.recurrence_id@">delete all occurrences</a>
+<li> <a href="cal-item-delete-all-occurrences?recurrence_id=@cal_item.recurrence_id@">delete all occurrences</a>
 </ul>
 </if>
 <else>
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	3 Jun 2002 04:08:17 -0000	1.3
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	3 Jun 2002 07:26:55 -0000	1.4
@@ -15,45 +15,12 @@
     {show_cal_nav 1}
 }
 
-# Select information about the calendar item
-if {![db_0or1row get_item_data { 
-    select   to_char(start_date,'HH:MIpm')as start_time,
-    start_date as raw_start_date,
-    to_char(start_date, 'MM/DD/YYYY') as start_date,
-    to_char(end_date, 'HH:MIpm') as end_time,
-    nvl(a. name, e.name) as name,
-    nvl(e.description, a.description) as description,
-    recurrence_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
-}]} {
-    ad_returnredirect "./"
-    return
-}
+calendar::item::get -cal_item_id $cal_item_id -array cal_item
 
-set item_data(start_time) $start_time
-set item_data(start_date) $start_date
-set item_data(end_time) $end_time
-set item_data(name) $name
-set item_data(description) $description
-set item_data(item_type) $item_type
-set item_data(recurrence_id) $recurrence_id
-
 # no time?
-set item_data(no_time_p) [dt_no_time_p -start_time $start_time -end_time $end_time]
+set cal_item(no_time_p) [dt_no_time_p -start_time $cal_item(start_time) -end_time $cal_item(end_time)]
 
-set cal_nav [dt_widget_calendar_navigation "view" day $raw_start_date "calendar_id"]
+# cal nav
+set cal_nav [dt_widget_calendar_navigation "view" day $cal_item(start_date) "calendar_id="]
 
 ad_return_template