Index: openacs-4/packages/acs-subsite/www/pvt/alerts-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/alerts-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/alerts-postgresql.xql	1 May 2001 19:00:18 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/alerts-postgresql.xql	15 May 2001 16:59:01 -0000	1.3
@@ -3,6 +3,18 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+<fullquery name="alerts_list">      
+      <querytext>
+      
+    select bea.valid_p, bea.frequency, bea.keywords, bt.topic, bea.rowid
+    from bboard_email_alerts bea, bboard_topics bt
+    where bea.user_id = :user_id
+    and bea.topic_id = bt.topic_id
+    order by bea.frequency
+      </querytext>
+</fullquery>
+
+ 
 <fullquery name="alerts_list_2">      
       <querytext>
       
@@ -17,7 +29,7 @@
     from   classified_email_alerts cea, ad_domains ad
     where  user_id = :user_id
     and    ad.domain_id = cea.domain_id
-    and    now() <= expires
+    and    current_timestamp <= expires
     order by expires desc
       </querytext>
 </fullquery>