Index: openacs-4/packages/notifications/tcl/sweep-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/notifications/tcl/sweep-procs.tcl	16 Oct 2003 14:06:46 -0000	1.17
+++ openacs-4/packages/notifications/tcl/sweep-procs.tcl	29 Jun 2004 10:18:42 -0000	1.18
@@ -49,8 +49,11 @@
             set prev_user_id 0
             set prev_type_id 0
             set prev_deliv_method_id ""
-            set batched_content ""
             set list_of_notification_ids [list]
+            set batched_content_text ""
+            set batched_content_html ""
+            set summary_text "[_ notifications.Contents]/n"
+            set summary_html "<h4>[_ notifications.Contents]</h4><ul>"
 
             # Add a stop codon
             lappend notifications STOP
@@ -76,7 +79,7 @@
                     ns_log Debug "NOTIF-BATCHED: batching things up for $prev_user_id"
 
                     # If no content, keep going
-                    if {![empty_string_p $batched_content]} {
+                    if {![empty_string_p $batched_content_text]} {
                         ns_log Debug "NOTIF-BATCHED: content to send!"
                         db_transaction {
                             ns_log Debug "NOTIF-BATCHED: sending content"
@@ -86,7 +89,8 @@
                                     -to_user_id $prev_user_id \
                                     -notification_type_id $prev_type_id \
                                     -subject "[_ notifications.lt_system_name_-_Batched]" \
-                                    -content $batched_content \
+                                    -content_text "$summary_text $batched_content_text" \
+                                    -content_html "$summary_html </ul><hr>$batched_content_html" \
                                     -delivery_method_id $prev_deliv_method_id
                             
                             ns_log Debug "NOTIF-BATCHED: marking notifications"
@@ -100,7 +104,10 @@
 
                         # Reset things
                         set list_of_notification_ids [list]
-                        set batched_content ""
+                        set batched_content_text ""
+                        set batched_content_html ""
+                        set summary_text "[_ notifications.Contents]/n"
+                        set summary_html "<h4>[_ notifications.Contents]</h4><ul>"
                     } else {
                         ns_log Debug "NOTIF-BATCHED: NO content to send!"
                     }
@@ -113,7 +120,33 @@
 
                 # append content to built-up content
                 ns_log Debug "NOTIF-BATCHED: appending one notif!"
-                append batched_content "[_ notifications.SUBJECT] [ns_set get $notif notif_subject]\n[ns_set get $notif notif_text]\n\n\n=====================\n\n\n"
+                #Lets see what we have:
+                set notif_text [ns_set get $notif notif_text]
+                set notif_html [ns_set get $notif notif_html]
+
+                if {[empty_string_p $notif_text]} {
+                    set notif_text [ad_html_text_convert -from html -to text $no
+tif_html]
+                }
+
+                if {[empty_string_p $notif_html]} {
+                    set notif_html [ad_html_text_convert -from text -to html $no
+tif_text]
+                } else {
+                    set html_content_p 1
+                }
+
+                append summary_text "[ns_set get $notif notif_subject]\n"
+                append summary_html "<li><a href=#[ns_set get $notif notificatio
+n_id]>[ns_set get $notif notif_subject]</a></li>"
+
+                append batched_content_text "[_ notifications.SUBJECT] [ns_set get $notif notif_s
+ubject]\n[ns_set get $notif notif_text]\n=====================\n"
+                append batched_content_html "<a name=[ns_set get $notif notifica
+tion_id]>[_ notifications.SUBJECT]</a> [ns_set get $notif notif_subject]\n $notif_html <hr><p>"
+                lappend list_of_notification_ids [ns_set get $notif notification
+_id]
+
                 lappend list_of_notification_ids [ns_set get $notif notification_id]
 
                 # Set the vars
@@ -132,7 +165,8 @@
                         -to_user_id [ns_set get $notif user_id] \
                         -notification_type_id [ns_set get $notif type_id] \
                         -subject [ns_set get $notif notif_subject] \
-                        -content [ns_set get $notif notif_text] \
+                        -content_text [ns_set get $notif notif_text] \
+                        -content_html [ns_set get $notif notif_html] \
                         -reply_object_id [ns_set get $notif response_id] \
                         -delivery_method_id [ns_set get $notif delivery_method_id]