Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/notifications/notifications.info	1 Jun 2002 21:43:16 -0000	1.4
+++ openacs-4/packages/notifications/notifications.info	25 Jun 2002 16:27:03 -0000	1.5
@@ -26,9 +26,12 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/notifications-init.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/notifications-package-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/notifications-package-drop.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/notifications-replies-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/notifications-replies-package-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/notifications-core-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/notifications-core-drop.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/notifications-create.sql"/>
+            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/notifications-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/notifications-init.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/notifications-package-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/notifications-package-drop.sql"/>
@@ -38,15 +41,19 @@
             <file type="query_file" db_type="oracle" path="tcl/notification-procs-oracle.xql"/>
             <file type="tcl_procs" path="tcl/notification-procs.tcl"/>
             <file type="query_file" path="tcl/notification-procs.xql"/>
+            <file type="query_file" db_type="oracle" path="tcl/notification-reply-procs-oracle.xql"/>
+            <file type="tcl_procs" path="tcl/notification-reply-procs.tcl"/>
             <file type="query_file" db_type="oracle" path="tcl/notification-request-procs-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="tcl/notification-request-procs-postgresql.xql"/>
             <file type="tcl_procs" path="tcl/notification-request-procs.tcl"/>
             <file type="query_file" path="tcl/notification-request-procs.xql"/>
             <file type="tcl_procs" path="tcl/notification-type-procs.tcl"/>
             <file type="query_file" path="tcl/notification-type-procs.xql"/>
             <file type="tcl_procs" path="tcl/notifications-security-procs.tcl"/>
+            <file type="tcl_procs" path="tcl/reply-sweep-procs.tcl"/>
             <file type="tcl_init" path="tcl/sweep-init.tcl"/>
             <file type="query_file" db_type="oracle" path="tcl/sweep-procs-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="tcl/sweep-procs-postgresql.xql"/>
             <file type="tcl_procs" path="tcl/sweep-procs.tcl"/>
             <file type="content_page" path="www/master.adp"/>
             <file type="content_page" path="www/request-delete.tcl"/>
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.3 -r1.4
--- openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	3 Jun 2002 22:27:00 -0000	1.3
+++ openacs-4/packages/notifications/tcl/sweep-procs-oracle.xql	25 Jun 2002 16:27:03 -0000	1.4
@@ -13,7 +13,7 @@
                                    notification_user_map
                               where notifications.type_id = notification_requests.type_id
                               and notifications.object_id = notification_requests.object_id
-                              and notifications.notification_id = notification_user_map.notification_id (+)
+                              and notifications.notification_id = notification_user_map.notification_id(+)
                               and sent_date is null)
         </querytext>
     </fullquery>
@@ -32,7 +32,7 @@
             where notifications.type_id = notification_requests.type_id
             and interval_id = :interval_id
             and notifications.object_id = notification_requests.object_id
-            and notifications.notification_id = notification_user_map.notification_id (+)
+            and notifications.notification_id = notification_user_map.notification_id(+)
             and 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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/tcl/sweep-procs-postgresql.xql	25 Jun 2002 16:27:03 -0000	1.1
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="notification::sweep::cleanup_notifications.select_notification_ids">
+        <querytext>
+            select notification_id
+            from notifications
+            where not exists (select notifications.notification_id
+                              from notifications
+                                  inner join notification_requests
+                                      on (
+                                               notifications.type_id = notification_requests.type_id
+                                           and notifications.object_id = notification_requests.object_id
+                                      )
+                                  left outer join notification_user_map
+                                      on (notifications.notification_id = notification_user_map.notification_id)
+                              where notification_user_map.sent_date is null)
+        </querytext>
+    </fullquery>
+
+    <fullquery name="notification::sweep::sweep_notifications.select_notifications">
+        <querytext>
+            select notifications.notification_id,
+                   notifications.notif_subject,
+                   notifications.notif_text,
+                   notifications.notif_html,
+                   notification_requests.user_id,
+                   acs_object__name(notifications.object_id) as object_name
+            from notifications
+                     inner join notification_requests
+                         on (
+                                  notifications.type_id = notification_requests.type_id
+                              and notifications.object_id = notification_requests.object_id
+                         )
+                     left outer join notification_user_map
+                         on (notifications.notification_id = notification_user_map.notification_id)
+            where notification_requests.interval_id = :interval_id
+            and notification_user_map.sent_date is null
+        </querytext>
+    </fullquery>
+
+</queryset>