Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql	26 May 2002 04:36:49 -0000	1.4
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql	28 Aug 2003 09:41:53 -0000	1.5
@@ -2,25 +2,26 @@
 
 <queryset>
 
-  <fullquery name="template_select_1">   
+  <fullquery name="ec_email_new_order.template_select_1">   
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list
       from ec_email_templates
       where email_template_id = 1
     </querytext>
   </fullquery>
 
-  <fullquery name="notification_select">      
+  <fullquery name="ec_email_product_notification.notification_select">      
     <querytext>
       select ep.email_on_purchase_list, ep.product_name
       from ec_items ei, ec_products ep
       where ei.product_id = ep.product_id
       and ei.order_id = :order_id
+      and email_on_purchase_list is not null
       group by ep.email_on_purchase_list, ep.product_name
     </querytext>
   </fullquery>
 
-  <fullquery name="user_select">      
+  <fullquery name="ec_email_delayed_credit_denied.user_select">      
     <querytext>
       select u.email, u.user_id
       from ec_orders, cc_users u
@@ -29,15 +30,15 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="template_select_3">      
+  <fullquery name="ec_email_delayed_credit_denied.template_select_3">      
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list
       from ec_email_templates
       where email_template_id = 3
     </querytext>
   </fullquery>
 
-  <fullquery name="shipment_select">      
+  <fullquery name="ec_email_order_shipped.shipment_select">      
     <querytext>
       select u.email, u.user_id, s.shipment_date, s.address_id, o.order_state, o.order_id
       from ec_orders o, cc_users u, ec_shipments s
@@ -47,7 +48,7 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="item_summary_select">      
+  <fullquery name="ec_email_order_shipped.item_summary_select">      
     <querytext>
       select p.product_name, p.one_line_description, p.product_id, i.price_charged, i.price_name, count(*) as quantity
       from ec_items i, ec_products p
@@ -57,15 +58,15 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="template_select_2">      
+  <fullquery name="ec_email_order_shipped.template_select_2">      
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list
       from ec_email_templates
       where email_template_id = 2
     </querytext>
   </fullquery>
 
-  <fullquery name="gift_certificate_select">      
+  <fullquery name="ec_email_new_gift_certificate_order.gift_certificate_select">      
     <querytext>
       select g.purchased_by as user_id, u.email, g.recipient_email, g.amount
       from ec_gift_certificates g, cc_users u
@@ -74,15 +75,15 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="template_select_4">      
+  <fullquery name="ec_email_new_gift_certificate_order.template_select_4">      
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list
       from ec_email_templates
       where email_template_id = 4
     </querytext>
   </fullquery>
 
-  <fullquery name="gift_certificate_select_2">      
+  <fullquery name="ec_email_gift_certificate_order_failure.gift_certificate_select_2">      
     <querytext>
       select g.purchased_by as user_id, u.email, g.recipient_email, g.amount, g.certificate_to, g.certificate_from, g.certificate_message
       from ec_gift_certificates g, cc_users u
@@ -91,43 +92,43 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="template_select_6">      
+  <fullquery name="ec_email_gift_certificate_order_failure.template_select_6">      
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list
       from ec_email_templates
       where email_template_id = 6
     </querytext>
   </fullquery>
 
-  <fullquery name="gift_certificate_select_3">      
+  <fullquery name="ec_email_gift_certificate_recipient.gift_certificate_select_3">      
     <querytext>
       select g.recipient_email as email, g.amount, g.certificate_to, g.certificate_from, g.certificate_message, g.claim_check
       from ec_gift_certificates g
       where g.gift_certificate_id=:gift_certificate_id
     </querytext>
   </fullquery>
 
-  <fullquery name="template_select_5">      
+  <fullquery name="ec_email_gift_certificate_recipient.template_select_5">      
     <querytext>
       select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id=5
     </querytext>
   </fullquery>
 
-  <fullquery name="user_id_select">      
+  <fullquery name="ec_email_gift_certificate_recipient.user_id_select">      
     <querytext>
       select user_id
       from cc_users
       where email=lower(:email)
     </querytext>
   </fullquery>
 
-  <fullquery name="user_identification_id_select">      
+  <fullquery name="ec_email_gift_certificate_recipient.user_identification_id_select">      
     <querytext>
       select user_identification_id from ec_user_identification where email=lower(:email)
     </querytext>
   </fullquery>
 
-  <fullquery name="user_identification_id_insert">      
+  <fullquery name="ec_email_gift_certificate_recipient.user_identification_id_insert">      
     <querytext>
       insert into ec_user_identification
       (user_identification_id, email)