Index: openacs-4/packages/calendar/tcl/calendar-callback-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-callback-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/tcl/calendar-callback-procs-oracle.xql	13 Jun 2005 07:20:39 -0000	1.1
+++ openacs-4/packages/calendar/tcl/calendar-callback-procs-oracle.xql	13 Jun 2005 13:51:04 -0000	1.2
@@ -7,8 +7,8 @@
         <querytext>
             select site_node.url(min(node_id))
             from site_nodes
-            where object_id = :(select package_id
-                               from cal_items ci
+            where object_id = (select package_id
+                               from cal_items ci, calendars
                                where cal_item_id = :cal_item_id
 			       and ci.on_which_calendar = calendars.calendar_id)
         </querytext>
Index: openacs-4/packages/calendar/tcl/calendar-callback-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-callback-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/tcl/calendar-callback-procs-postgresql.xql	13 Jun 2005 07:20:39 -0000	1.1
+++ openacs-4/packages/calendar/tcl/calendar-callback-procs-postgresql.xql	13 Jun 2005 13:51:04 -0000	1.2
@@ -7,9 +7,9 @@
         <querytext>
             select site_node__url(min(node_id))
             from site_nodes
-            where object_id = :(select package_id
-                               from cal_items ci
-                               where cal_item_id = :cal_item_id
+            where object_id = (select package_id
+                               from cal_items ci, calendars
+                               where cal_item_id = :object_id
 			       and ci.on_which_calendar = calendars.calendar_id)
         </querytext>
     </fullquery>
Index: openacs-4/packages/calendar/tcl/calendar-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-callback-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/calendar-callback-procs.tcl	13 Jun 2005 08:45:29 -0000	1.2
+++ openacs-4/packages/calendar/tcl/calendar-callback-procs.tcl	13 Jun 2005 13:51:04 -0000	1.3
@@ -23,13 +23,13 @@
 } {
     calendar::item::get -cal_item_id $object_id -array cal_item
 
-    set combined_content $cal_item(calendar_name)
+    set combined_content "$cal_item(calendar_name)\n"
     append combined_content [ad_html_text_convert -from text/html -to text/plain -- $cal_item(description)]
 
     # TODO implement attachments
 
-    return [list object_id $cal_item_id \
-                title $cal_item(title) \
+    return [list object_id $object_id \
+                title $cal_item(name) \
                 content $combined_content \
                 keywords {} \
                 storage_type text \
@@ -46,7 +46,7 @@
 } {
     calendar::item::get -cal_item_id $object_id -array cal_item
 
-    return "[ad_url][db_string select_cal_item_package_url {}]cal-item-view?cal_item_id=$cal_item_id"
+    return "[ad_url][db_string select_cal_item_package_url {}]cal-item-view?cal_item_id=$object_id"
 }
 
 ad_proc -public -callback search::datasource -impl calendar {} {