Index: openacs-4/packages/general-comments/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/index-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/general-comments/www/index-oracle.xql	27 Oct 2014 16:41:43 -0000	1.3
+++ openacs-4/packages/general-comments/www/index-oracle.xql	22 Nov 2017 14:13:32 -0000	1.4
@@ -26,32 +26,5 @@
      
       </querytext>
 </fullquery>
-
-<partialquery name="modified_last_24hours">      
-      <querytext>
-
-		creation_date + 1 > sysdate
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_week">      
-      <querytext>
-
-		creation_date + 7 > sysdate
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_month">      
-      <querytext>
-
-		creation_date + 30 > sysdate
-
-      </querytext>
-</partialquery>
  
-
-
- 
 </queryset>
Index: openacs-4/packages/general-comments/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/index-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/general-comments/www/index-postgresql.xql	27 Oct 2014 16:41:43 -0000	1.4
+++ openacs-4/packages/general-comments/www/index-postgresql.xql	22 Nov 2017 14:13:32 -0000	1.5
@@ -5,7 +5,6 @@
 
 <fullquery name="comments_select">      
       <querytext>
-     select * from (
      select g.comment_id,
            r.title, 
            acs_object__name(o.creation_user) as author,
@@ -21,34 +20,9 @@
            r.revision_id = o.object_id and
            r.revision_id = i.latest_revision and 
            o.creation_user = :user_id
-          [ad_dimensional_sql $dimensional]) as unordered
+          [ad_dimensional_sql $dimensional]
      [template::list::orderby_clause -orderby -name comments_list]
       </querytext>
 </fullquery>
-
-
-<partialquery name="modified_last_24hours">      
-      <querytext>
-
-		creation_date > now() - '1 days'::interval 
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_week">      
-      <querytext>
-
-		creation_date > now() - '7 days'::interval 
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_month">      
-      <querytext>
-
-		creation_date > now() - '30 days'::interval
-
-      </querytext>
-</partialquery>
  
 </queryset>
Index: openacs-4/packages/general-comments/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/www/index.xql	14 Jun 2001 19:52:22 -0000	1.1
+++ openacs-4/packages/general-comments/www/index.xql	22 Nov 2017 14:13:32 -0000	1.2
@@ -1,21 +1,44 @@
 <?xml version="1.0"?>
 <queryset>
 
-<partialquery name="status_approved">      
-      <querytext>
+  <partialquery name="status_approved">      
+    <querytext>
 
-	      	i.live_revision is not null
+      i.live_revision is not null
 
-      </querytext>
-</partialquery>
+    </querytext>
+  </partialquery>
 
-<partialquery name="status_unapproved">      
-      <querytext>
+  <partialquery name="status_unapproved">      
+    <querytext>
 
-	      	i.live_revision is null
+      i.live_revision is null
 
-      </querytext>
-</partialquery>
+    </querytext>
+  </partialquery>
 
- 
+  <partialquery name="modified_last_24hours">      
+    <querytext>
+
+      creation_date > current_timestamp - interval '1' day
+
+    </querytext>
+  </partialquery>
+
+  <partialquery name="modified_last_week">      
+    <querytext>
+
+      creation_date > current_timestamp - interval '7' day
+
+    </querytext>
+  </partialquery>
+
+  <partialquery name="modified_last_month">      
+    <querytext>
+
+      creation_date > current_timestamp - interval '30' day
+      
+    </querytext>
+  </partialquery>
+  
 </queryset>
Index: openacs-4/packages/general-comments/www/admin/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/Attic/index-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/admin/index-oracle.xql	27 Oct 2014 16:41:44 -0000	1.2
+++ openacs-4/packages/general-comments/www/admin/index-oracle.xql	22 Nov 2017 14:16:18 -0000	1.3
@@ -25,31 +25,5 @@
 
       </querytext>
 </fullquery>
-<partialquery name="modified_last_24hours">      
-      <querytext>
-
-		creation_date + 1 > sysdate
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_week">      
-      <querytext>
-
-		creation_date + 7 > sysdate
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_month">      
-      <querytext>
-
-		creation_date + 30 > sysdate
-
-      </querytext>
-</partialquery>
  
-
-
- 
 </queryset>
Index: openacs-4/packages/general-comments/www/admin/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/Attic/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/general-comments/www/admin/index-postgresql.xql	27 Oct 2014 16:41:44 -0000	1.3
+++ openacs-4/packages/general-comments/www/admin/index-postgresql.xql	22 Nov 2017 14:16:18 -0000	1.4
@@ -5,7 +5,6 @@
 
 <fullquery name="comments_select">      
       <querytext>
-    select * from (      
     select g.comment_id,
            r.title, 
            acs_object__name(o.creation_user) as author,
@@ -21,33 +20,9 @@
      where g.comment_id = i.item_id and
            r.revision_id = o.object_id and
            r.revision_id = i.latest_revision
-          [ad_dimensional_sql $dimensional]) as unordered
+          [ad_dimensional_sql $dimensional]
     [template::list::orderby_clause -orderby -name comments_list]
       </querytext>
 </fullquery>
-
-
-<partialquery name="modified_last_24hours">      
-      <querytext>
-
-		creation_date > now() - '1 days'::interval
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_week">      
-      <querytext>
-
-		creation_date > now() - '7 days'::interval 
-
-      </querytext>
-</partialquery>
-
-<partialquery name="modified_last_month">      
-      <querytext>
-
-		creation_date > now() - '30 days'::interval 
-      </querytext>
-</partialquery>
  
 </queryset>
Index: openacs-4/packages/general-comments/www/admin/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/www/admin/index.xql	14 Jun 2001 19:52:22 -0000	1.1
+++ openacs-4/packages/general-comments/www/admin/index.xql	22 Nov 2017 14:16:18 -0000	1.2
@@ -1,29 +1,52 @@
 <?xml version="1.0"?>
 <queryset>
 
-<partialquery name="status_approved">      
-      <querytext>
+  <partialquery name="status_approved">
+    <querytext>
 
-	      	i.live_revision is not null
+      i.live_revision is not null
 
-      </querytext>
-</partialquery>
+    </querytext>
+  </partialquery>
 
-<partialquery name="status_unapproved">      
-      <querytext>
+  <partialquery name="status_unapproved">
+    <querytext>
 
-	      	i.live_revision is null
+      i.live_revision is null
 
-      </querytext>
-</partialquery>
+    </querytext>
+  </partialquery>
 
-<partialquery name="modified_show_all">      
-      <querytext>
+  <partialquery name="modified_show_all">
+    <querytext>
 
-		1 = 1
+      1 = 1
 
-      </querytext>
-</partialquery>
+    </querytext>
+  </partialquery>
 
- 
+  <partialquery name="modified_last_24hours">
+    <querytext>
+
+      creation_date > current_timestamp - interval '1' day
+
+    </querytext>
+  </partialquery>
+
+  <partialquery name="modified_last_week">
+    <querytext>
+
+      creation_date > current_timestamp - interval '7' day
+
+    </querytext>
+  </partialquery>
+
+  <partialquery name="modified_last_month">
+    <querytext>
+
+      creation_date > current_timestamp - interval '30' day
+
+    </querytext>
+  </partialquery>
+
 </queryset>
Index: openacs-4/packages/notifications/tcl/notification-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/notifications/tcl/notification-procs-oracle.xql	29 Jun 2004 10:18:42 -0000	1.6
+++ openacs-4/packages/notifications/tcl/notification-procs-oracle.xql	22 Nov 2017 14:19:35 -0000	1.7
@@ -11,17 +11,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="notification::mark_sent.insert_notification_user_map">
-        <querytext>
-            insert
-            into notification_user_map
-            (notification_id, user_id, sent_date)
-            select :notification_id, :user_id, sysdate
-            from dual where exists (select 1 from notifications
-                                    where notification_id = :notification_id)
-        </querytext>
-    </fullquery>
-
     <fullquery name="notification::new.update_message">
         <querytext>
                 update notifications
Index: openacs-4/packages/notifications/tcl/notification-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/notifications/tcl/notification-procs-postgresql.xql	29 Jun 2004 10:18:42 -0000	1.4
+++ openacs-4/packages/notifications/tcl/notification-procs-postgresql.xql	22 Nov 2017 14:19:35 -0000	1.5
@@ -9,17 +9,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="notification::mark_sent.insert_notification_user_map">
-        <querytext>
-            insert
-            into notification_user_map
-            (notification_id, user_id, sent_date)
-            select :notification_id, :user_id, now()
-            from dual where exists (select 1 from notifications
-                                    where notification_id = :notification_id)
-        </querytext>
-    </fullquery>
-
     <fullquery name="notification::new.update_message">
         <querytext>
                 update notifications
Index: openacs-4/packages/notifications/tcl/notification-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/notifications/tcl/notification-procs.xql	2 Sep 2008 22:31:04 -0000	1.11
+++ openacs-4/packages/notifications/tcl/notification-procs.xql	22 Nov 2017 14:19:35 -0000	1.12
@@ -84,4 +84,15 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="notification::mark_sent.insert_notification_user_map">
+        <querytext>
+            insert
+            into notification_user_map
+            (notification_id, user_id, sent_date)
+            select :notification_id, :user_id, current_timestamp
+            from dual where exists (select 1 from notifications
+                                    where notification_id = :notification_id)
+        </querytext>
+    </fullquery>
+    
 </queryset>