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.6 -r1.7
--- openacs-4/packages/notifications/tcl/sweep-procs.tcl	25 Jun 2002 18:58:06 -0000	1.6
+++ openacs-4/packages/notifications/tcl/sweep-procs.tcl	1 Jul 2002 19:35:30 -0000	1.7
@@ -39,28 +39,99 @@
         # on the mapping table and a null check
         set notifications [db_list_of_ns_sets select_notifications {}]
 
-        foreach notif $notifications {
-            # If not batched, just send out and mark it
-            if {!$batched_p} {
+        if {$batched_p} {
+            set prev_user_id 0
+            set prev_type_id 0
+            set prev_deliv_method_id ""
+            set batched_content ""
+            set list_of_notification_ids [list]
+
+            # Add a stop codon
+            lappend notifications STOP
+
+            # Batched sending
+            foreach notif $notifications {
+                ns_log Notice "NOTIF-BATCHED: one notif $notif"
+
+                if {$notif != "STOP"} {
+                    ns_log Notice "NOTIF-BATCHED: NOT a stop codon"
+                    set user_id [ns_set get $notif user_id]
+                    set type_id [ns_set get $notif type_id]
+                } else {
+                    ns_log Notice "NOTIF-BATCHED stop codon!"
+                    set user_id ""
+                    set type_id ""
+                }
+
+                # Check if we have a new user_id and type_id
+                # if so, batch up previous stuff and send it
+                if {$notif == "STOP" || $user_id != $prev_user_id || $type_id != $prev_type_id} {
+
+                    ns_log Notice "NOTIF-BATCHED: batching things up for $prev_user_id"
+
+                    # If no content, keep going
+                    if {![empty_string_p $batched_content]} {
+                        ns_log Notice "NOTIF-BATCHED: content to send!"
+                        db_transaction {
+                            ns_log Notice "NOTIF-BATCHED: sending content"
+                            notification::delivery::send -to_user_id $prev_user_id \
+                                    -notification_type_id $prev_type_id \
+                                    -subject "\[[ad_system_name] - Batched Notification\]" \
+                                    -content $batched_content \
+                                    -delivery_method_id $prev_deliv_method_id
+                            
+                            ns_log Notice "NOTIF-BATCHED: marking notifications"
+                            foreach not_id $list_of_notification_ids {
+                                # Mark it as sent
+                                notification::mark_sent \
+                                        -notification_id $not_id \
+                                        -user_id $prev_user_id
+                            }         
+                        }
+
+                        # Reset things
+                        set list_of_notification_ids [list]
+                        set batched_content ""
+                    } else {
+                        ns_log Notice "NOTIF-BATCHED: NO content to send!"
+                    }
+                }
+
+                if {$notif == "STOP"} {
+                    continue
+                }
+                
+
+                # append content to built-up content
+                ns_log Notice "NOTIF-BATCHED: appending one notif!"
+                append batched_content "SUBJECT: [ns_set get $notif object_name] - [ns_set get $notif notif_subject]\n[ns_set get $notif notif_text]\n=====================\n"
+                lappend list_of_notification_ids [ns_set get $notif notification_id]
+
+                # Set the vars
+                set prev_user_id $user_id
+                set prev_type_id $type_id
+                set prev_deliv_method_id [ns_set get $notif delivery_method_id]
+            }
+            
+        } else {
+            # Unbatched
+            foreach notif $notifications {
                 db_transaction {
                     # Send it
                     notification::delivery::send -to_user_id [ns_set get $notif user_id] \
-                        -notification_type_id [ns_set get $notif type_id] \
-                        -subject "\[[ad_system_name] - [ns_set get $notif object_name]\] [ns_set get $notif notif_subject]" \
-                        -content [ns_set get $notif notif_text] \
-                        -reply_object_id [ns_set get $notif response_id] \
-                        -delivery_method_id [ns_set get $notif delivery_method_id]
-
+                            -notification_type_id [ns_set get $notif type_id] \
+                            -subject "\[[ad_system_name] - [ns_set get $notif object_name]\] [ns_set get $notif notif_subject]" \
+                            -content [ns_set get $notif notif_text] \
+                            -reply_object_id [ns_set get $notif response_id] \
+                            -delivery_method_id [ns_set get $notif delivery_method_id]
+                    
                     # Markt it as sent
                     notification::mark_sent \
-                        -notification_id [ns_set get $notif notification_id] \
-                        -user_id [ns_set get $notif user_id]
+                            -notification_id [ns_set get $notif notification_id] \
+                            -user_id [ns_set get $notif user_id]
                 }
-            } else {
-                # It's batched, we're not handling this one yet
-                ns_log Notice "Notifications: Batched Request not handled"
             }
-        }
+        } 
     }
 
 }