Index: openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql,v
diff -u -r1.9.2.6 -r1.9.2.7
--- openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	12 Jun 2003 13:34:52 -0000	1.9.2.6
+++ openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	4 Jul 2003 20:39:25 -0000	1.9.2.7
@@ -9,14 +9,16 @@
             from notifications
             minus
             select nnr.notification_id
-            from (select notification_id, user_id
-                  from notifications, notification_requests
+	    from (select notification_id, user_id
+                  from notifications, notification_requests, acs_objects
                   where notifications.type_id = notification_requests.type_id
-                    and notifications.object_id = notification_requests.object_id) nnr,
+		    and notifications.object_id = notification_requests.object_id
+		    and notification_requests.request_id = acs_objects.object_id
+		    and acs_objects.creation_date <= notifications.notif_date) nnr,
               notification_user_map
             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 notification_user_map.sent_date is null
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql,v
diff -u -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql	12 Jun 2003 13:34:52 -0000	1.3.2.6
+++ openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql	4 Jul 2003 20:39:25 -0000	1.3.2.7
@@ -10,8 +10,9 @@
            except
            select distinct notification_id
            from notifications inner join notification_requests using (type_id, object_id)
+             inner join acs_objects on (notification_requests.request_id = acs_objects.object_id)
              left outer join notification_user_map using (notification_id, user_id)
-           where sent_date is null
+           where sent_date is null and creation_date <= notif_date
         </querytext>
     </fullquery>
 
@@ -33,7 +34,7 @@
             where sent_date is null
               and creation_date <= notif_date
               and interval_id = :interval_id
-	      order by user_id, type_id, notif_date
+          order by user_id, type_id, notif_date
         </querytext>
     </fullquery>