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.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/alerts-postgresql.xql	22 Apr 2001 16:13:15 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/pvt/alerts-postgresql.xql	1 May 2001 19:00:18 -0000	1.2
@@ -1,25 +1,11 @@
 <?xml version="1.0"?>
+
 <queryset>
-<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="dbqd.acs-subsite.www.pvt.alerts.name_get">
-  <querytext>
-select first_names, last_name, email, url from persons, parties where persons.person_id = parties.party_id and party_id =:user_id
-  </querytext>
-</fullquery>
-
-<fullquery name="dbqd.acs-subsite.www.pvt.alerts.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="dbqd.acs-subsite.www.pvt.alerts.alerts_list_2">
-  <querytext>
+<fullquery name="alerts_list_2">      
+      <querytext>
+      
     select cea.valid_p,
            ad.domain,
            cea.alert_id,
@@ -31,9 +17,10 @@
     from   classified_email_alerts cea, ad_domains ad
     where  user_id = :user_id
     and    ad.domain_id = cea.domain_id
-    and    sysdate &lt;= expires
+    and    now() <= expires
     order by expires desc
-  </querytext>
+      </querytext>
 </fullquery>
 
+ 
 </queryset>