Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/notifications/tcl/notification-procs.tcl	15 Jun 2005 18:33:19 -0000	1.12
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl	6 Sep 2006 18:11:55 -0000	1.13
@@ -84,6 +84,7 @@
         {-default_request_data {}}
         {-return_notified:boolean}
         {-notif_user {}}
+	{-notif_date {}}
     } {
         Create a new notification if any notification requests exist for the object and type.
         
@@ -303,7 +304,7 @@
                 set extra_vars [ns_set create]
                 oacs_util::vars_to_ns_set \
                     -ns_set $extra_vars \
-                    -var_list {notification_id type_id object_id response_id notif_subject notif_text notif_html notif_user}
+                    -var_list {notification_id type_id object_id response_id notif_subject notif_text notif_html notif_user notif_date}
                 
                 # Create the notification
                 package_instantiate_object -extra_vars $extra_vars notification
Index: openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/Attic/sweep-procs-oracle.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	28 Aug 2003 09:41:58 -0000	1.14
+++ openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	6 Sep 2006 18:11:56 -0000	1.15
@@ -19,6 +19,7 @@
             where nnr.notification_id = notification_user_map.notification_id(+)
               and nnr.user_id = notification_user_map.user_id(+)
 	      and notification_user_map.sent_date is null
+	      and notifications.notif_date < sysdate()
         </querytext>
     </fullquery>
 
@@ -44,6 +45,7 @@
             where nnr.notification_id = notification_user_map.notification_id(+)
               and nnr.user_id = notification_user_map.user_id(+)
               and notification_user_map.sent_date is null
+              and nnr.notif_date < sysdate()
               and acs_objects.object_id = nnr.request_id
               and acs_objects.creation_date <= nnr.notif_date
             order by nnr.user_id, nnr.type_id, nnr.notif_date
Index: openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/Attic/sweep-procs-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql	28 Aug 2003 09:41:58 -0000	1.7
+++ openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql	6 Sep 2006 18:11:56 -0000	1.8
@@ -33,6 +33,7 @@
               left outer join notification_user_map using (notification_id, user_id)
             where sent_date is null
               and creation_date <= notif_date
+              and notif_date < current_timestamp
               and interval_id = :interval_id
           order by user_id, type_id, notif_date
         </querytext>