Index: openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl	18 Jul 2001 18:19:01 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ec-audit-trail-procs.tcl	18 Jul 2001 23:46:14 -0000	1.3
@@ -336,7 +336,7 @@
     }
 }
 
-proc_doc ec_audit_delete_row { id_list id_column_list audit_table_name } {
+ad_proc ec_audit_delete_row { id_list id_column_list audit_table_name } {
     Inserts an entry to the audit table to log a delete. Each id is
     inserted into its id_column as well as user_id, IP address, and date.
 } {
@@ -379,7 +379,7 @@
 
 }
 
-proc_doc ec_audit_trail_for_table {
+ad_proc ec_audit_trail_for_table {
     main_table_name
     audit_table_name
     id_column
Index: openacs-4/packages/ecommerce/tcl/ec-style-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/Attic/ec-style-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ec-style-procs.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ec-style-procs.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="ec_style_plain_fancy_from_cookie.preference_select">      
+<fullquery name="ec_style_user_preferences_from_db.preference_select">      
       <querytext>
       
 	select prefer_text_only_p, language_preference 
Index: openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-oracle.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-oracle.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -29,7 +29,7 @@
 </fullquery>
 
  
-<fullquery name="ec_creditcard_return.cybercash_log_insert">      
+<fullquery name="ec_talk_to_cybercash.cybercash_log_insert">      
       <querytext>
       
 	insert into ec_cybercash_log ([join [ad_ns_set_keys -exclude "cc_time" $bind_vars] ", "], cc_time, txn_attempted_time)
@@ -39,7 +39,7 @@
 </fullquery>
 
  
-<fullquery name="ec_creditcard_return.cybercash_date_create">      
+<fullquery name="ec_date_to_cybercash_date_for_query.cybercash_date_create">      
       <querytext>
       
 	select to_char(:n_hours_to_add / 24 + to_date(:the_date, 'YYYY-MM-DD HH24:MI:SS'), 'YYYYMMDDHH24MISS') from dual
Index: openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-postgresql.xql	16 Jul 2001 20:07:06 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs-postgresql.xql	18 Jul 2001 23:46:14 -0000	1.4
@@ -29,7 +29,7 @@
 </fullquery>
 
  
-<fullquery name="ec_creditcard_return.cybercash_log_insert">      
+<fullquery name="ec_talk_to_cybercash.cybercash_log_insert">      
       <querytext>
       
 	insert into ec_cybercash_log ([join [ad_ns_set_keys -exclude "cc_time" $bind_vars] ", "], cc_time, txn_attempted_time)
@@ -39,7 +39,7 @@
 </fullquery>
 
  
-<fullquery name="ec_creditcard_return.cybercash_date_create">      
+<fullquery name="ec_date_to_cybercash_date_for_query.cybercash_date_create">      
       <querytext>
       
 	select to_char(timespan_days(:n_hours_to_add/24::float) + to_date(:the_date, 'YYYY-MM-DD HH24:MI:SS'), 'YYYYMMDDHH24MISS')
Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -17,7 +17,7 @@
 </fullquery>
 
  
-<fullquery name="email_log_insert">      
+<fullquery name="email_log_insert_1">      
       <querytext>
       
 	    insert into ec_automatic_email_log
@@ -28,20 +28,20 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_2">      
       <querytext>
       
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, sysdate)
-      
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, order_id, shipment_id, date_sent)
+          values
+          (:user_identification_id, 2, :order_id, :shipment_id, sysdate)
+
       </querytext>
 </fullquery>
 
  
-<fullquery name="email_log_insert">      
+<fullquery name="email_log_insert_3">      
       <querytext>
       
 	  insert into ec_automatic_email_log
@@ -52,41 +52,51 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_4">      
       <querytext>
       
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, sysdate)
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 4, :gift_certificate_id, sysdate)
+
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="email_log_insert_5">      
+      <querytext>
       
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 5, :gift_certificate_id, sysdate)
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_6">      
       <querytext>
       
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, sysdate)
-      
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 6, :gift_certificate_id, sysdate)
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="user_identification_id_seq">
       <querytext>
+
+        select ec_user_ident_id_sequence.nextval from dual
       
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, sysdate)
-      
       </querytext>
 </fullquery>
 
- 
+
 </queryset>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -17,76 +17,85 @@
 </fullquery>
 
  
-<fullquery name="email_log_insert">      
+<fullquery name="email_log_insert_1">
       <querytext>
-      
-	    insert into ec_automatic_email_log
-	    (user_identification_id, email_template_id, order_id, date_sent)
-	    values
-	    (:user_identification_id, 1, :order_id, current_timestamp)
-	
+
+            insert into ec_automatic_email_log
+            (user_identification_id, email_template_id, order_id, date_sent)
+            values
+            (:user_identification_id, 1, :order_id, current_timestamp)
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_2">
       <querytext>
-      
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, current_timestamp)
-      
+
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, order_id, shipment_id, date_sent)
+          values
+          (:user_identification_id, 2, :order_id, :shipment_id, current_timestamp)
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_3">
       <querytext>
-      
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, current_timestamp)
-      
+
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, order_id, date_sent)
+          values
+          (:user_identification_id, 3, :order_id, current_timestamp)
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_4">
       <querytext>
-      
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, current_timestamp)
-      
+
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 4, :gift_certificate_id, current_timestamp)
+
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="email_log_insert">      
+
+<fullquery name="email_log_insert_5">
       <querytext>
-      
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, current_timestamp)
-      
+
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 5, :gift_certificate_id, current_timestamp)
+
       </querytext>
 </fullquery>
 
+
+<fullquery name="email_log_insert_6">
+      <querytext>
+
+          insert into ec_automatic_email_log
+          (user_identification_id, email_template_id, gift_certificate_id, date_sent)
+          values
+          (:user_identification_id, 6, :gift_certificate_id, current_timestamp)
+
+      </querytext>
+</fullquery>
  
-<fullquery name="email_log_insert">      
+
+<fullquery name="user_identification_id_seq">
       <querytext>
-      
-	  insert into ec_automatic_email_log
-	  (user_identification_id, email_template_id, order_id, date_sent)
-	  values
-	  (:user_identification_id, 3, :order_id, current_timestamp)
-      
+
+	select ec_user_ident_id_seq.nextval 
+
       </querytext>
 </fullquery>
 
- 
 </queryset>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl	20 Apr 2001 20:51:13 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl	18 Jul 2001 23:46:14 -0000	1.2
@@ -10,7 +10,7 @@
   @author ported by Jerry Asher (jerry-ecommerce@hollyjerry.org)
 }
 
-proc_doc ec_sendmail_from_service { email_to reply_to email_subject email_body {additional_headers ""} {bcc ""} } "Use this when you're sending out customer service emails.  It's invoked just like ns_sendmail, except that the email will always be from the customer service email address.  The reply-to field can be used for the perl/qmail service-345-9848@whatever.com email trick (but it doesn't have to be).<p>Note: one major difference from ns_sendmail: with ns_sendmail, putting a Cc header does not actually send an extra copy of the email; it just puts Cc: whomever@wherever into the header (and then you'd have to specify whomever@wherever in the bcc argument).  This procedure does send the email to the Cc'd email addresses." {
+ad_proc ec_sendmail_from_service { email_to reply_to email_subject email_body {additional_headers ""} {bcc ""} } "Use this when you're sending out customer service emails.  It's invoked just like ns_sendmail, except that the email will always be from the customer service email address.  The reply-to field can be used for the perl/qmail service-345-9848@whatever.com email trick (but it doesn't have to be).<p>Note: one major difference from ns_sendmail: with ns_sendmail, putting a Cc header does not actually send an extra copy of the email; it just puts Cc: whomever@wherever into the header (and then you'd have to specify whomever@wherever in the bcc argument).  This procedure does send the email to the Cc'd email addresses." {
 
     set extra_headers [ns_set new]
     ns_set put $extra_headers "Reply-to" $reply_to
@@ -27,7 +27,7 @@
     qmail $email_to $from $email_subject $email_body $extra_headers
 }
 
-proc_doc ec_email_new_order { order_id } "Use this to send out the \"New Order\" email." {
+ad_proc ec_email_new_order { order_id } "Use this to send out the \"New Order\" email." {
     db_1row email_info_select {
 	select u.email,
                to_char(confirmed_date,'MM/DD/YY') as confirmed_date,
@@ -59,7 +59,7 @@
     regsub -all "&" $system_url {\\&} system_url
     
     # Note: template #1 is defined to be the "New Order" email
-    db_1row template_select {
+    db_1row template_select_1 {
 	select subject as email_subject, message as email_body, issue_type_list
 	from ec_email_templates
 	where email_template_id = 1
@@ -87,7 +87,7 @@
 	}
 
 	# add a row to the automatic email log
-	db_dml email_log_insert {
+	db_dml email_log_insert_1 {
 	    insert into ec_automatic_email_log
 	    (user_identification_id, email_template_id, order_id, date_sent)
 	    values
@@ -102,7 +102,7 @@
     
 }
 
-proc_doc ec_email_product_notification { order_id } "This proc sends notifications for any products in the order that require it." {
+ad_proc ec_email_product_notification { order_id } "This proc sends notifications for any products in the order that require it." {
 
     set order_link [ec_securelink "[ec_url]admin/orders/one?[export_url_vars order_id]"]
 #    if { [ad_ssl_available_p] } {
@@ -130,7 +130,7 @@
   }
 }
 
-proc_doc ec_email_delayed_credit_denied { order_id } "Use this to send out the \"Delayed Credit Denied\" email." {
+ad_proc ec_email_delayed_credit_denied { order_id } "Use this to send out the \"Delayed Credit Denied\" email." {
     
     db_1row user_select {
 	select u.email, u.user_id
@@ -148,7 +148,7 @@
     regsub -all "&" $system_url {\\&} system_url
     
     # Note: template #3 is defined to be the "Delayed Credit Denied" email
-    db_1row template_select {
+    db_1row template_select_3 {
 	select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id = 3
     }
 
@@ -167,7 +167,7 @@
       set issue_id [lindex $user_identification_and_issue_id 1]
 
       # add a row to the automatic email log
-      db_dml email_log_insert {
+      db_dml email_log_insert_3 {
 	  insert into ec_automatic_email_log
 	  (user_identification_id, email_template_id, order_id, date_sent)
 	  values
@@ -181,7 +181,7 @@
 
 }
 
-proc_doc ec_email_order_shipped { shipment_id } "Use this to send out the \"Order Shipped\" email after a shipment is made (full or partial order)." {
+ad_proc ec_email_order_shipped { shipment_id } "Use this to send out the \"Order Shipped\" email after a shipment is made (full or partial order)." {
     
     db_1row shipment_select {
 	select u.email, u.user_id, s.shipment_date, s.address_id, o.order_state, o.order_id
@@ -228,7 +228,7 @@
     regsub -all "&" $system_url {\\&} system_url
     
     # Note: template #2 is defined to be the "Order Shipped" email
-    db_1row template_select {
+    db_1row template_select_2 {
 	select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id = 2
     }
 
@@ -251,7 +251,7 @@
       set issue_id [lindex $user_identification_and_issue_id 1]
 
       # add a row to the automatic email log
-      db_dml email_log_insert {
+      db_dml email_log_insert_2 {
 	  insert into ec_automatic_email_log
 	  (user_identification_id, email_template_id, order_id, shipment_id, date_sent)
 	  values
@@ -265,7 +265,7 @@
     
 }
 
-proc_doc ec_email_new_gift_certificate_order { gift_certificate_id } {
+ad_proc ec_email_new_gift_certificate_order { gift_certificate_id } {
 
     Use this to send out the \"New Gift Certificate Order\" email
     after a gift certificate order is authorized.
@@ -288,7 +288,7 @@
     regsub -all "&" $customer_service_signature {\\&} customer_service_signature
     
     # Note: template #4 is defined to be the "New Gift Certificate Order" email
-    db_1row template_select {
+    db_1row template_select_4 {
 	select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id = 4
     }
 
@@ -309,7 +309,7 @@
       set issue_id [lindex $user_identification_and_issue_id 1]
 
       # add a row to the automatic email log
-      db_dml email_log_insert {
+      db_dml email_log_insert_4 {
 	  insert into ec_automatic_email_log
 	  (user_identification_id, email_template_id, gift_certificate_id, date_sent)
 	  values
@@ -323,8 +323,8 @@
 
 }
 
-proc_doc ec_email_gift_certificate_order_failure { gift_certificate_id } "Use this to send out the \"Gift Certificate Order Failure\" email after it is determined that a previously inconclusive auth failed." {
-    db_1row gift_certificate_select {
+ad_proc ec_email_gift_certificate_order_failure { gift_certificate_id } "Use this to send out the \"Gift Certificate Order Failure\" email after it is determined that a previously inconclusive auth failed." {
+    db_1row gift_certificate_select_2 {
 	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
          where g.purchased_by=u.user_id
@@ -357,7 +357,7 @@
     
 
     # Note: template #6 is defined to be the "Gift Certificate Order Failure" email
-    db_1row template_select {
+    db_1row template_select_6 {
 	select subject as email_subject, message as email_body, issue_type_list
           from ec_email_templates
          where email_template_id = 6
@@ -381,7 +381,7 @@
       set issue_id [lindex $user_identification_and_issue_id 1]
 
       # add a row to the automatic email log
-      db_dml email_log_insert {
+      db_dml email_log_insert_6 {
 	  insert into ec_automatic_email_log
 	  (user_identification_id, email_template_id, gift_certificate_id, date_sent)
 	  values
@@ -398,9 +398,9 @@
 # in this email, the recipient isn't necessarily a user of the system, so the customer service issue
 # creation code is a little different than in the other autoemails
 
-proc_doc ec_email_gift_certificate_recipient { gift_certificate_id } "Use this to send out the \"Gift Certificate Recipient\" email after it a purchased certificate is authorized." {
+ad_proc ec_email_gift_certificate_recipient { gift_certificate_id } "Use this to send out the \"Gift Certificate Recipient\" email after it a purchased certificate is authorized." {
 
-    db_1row gift_certificate_select {
+    db_1row gift_certificate_select_3 {
 	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
@@ -432,7 +432,7 @@
     
 
     # Note: template #5 is defined to be the "Gift Certificate Recipient" email
-    db_1row template_select "select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id=5"
+    db_1row template_select_5 "select subject as email_subject, message as email_body, issue_type_list from ec_email_templates where email_template_id=5"
 
     # and get rid of ctrl-M's in the body
     regsub -all "\r" $email_body "" email_body
@@ -461,7 +461,7 @@
 	set user_identification_id [db_string user_identification_id_select "select user_identification_id from ec_user_identification where upper(email)=upper(:email)" -default ""]
 
 	if { [empty_string_p $user_identification_id] } {
-	  set user_identification_id [db_string user_identification_id_select "select ec_user_ident_id_sequence.nextval from dual"]
+	  set user_identification_id [db_string user_identification_id_seq "select ec_user_ident_id_sequence.nextval from dual"]
 	  set trimmed_email [string trim $email]
 
 	    db_dml user_identification_id_insert {
@@ -479,7 +479,7 @@
       set issue_id [lindex $user_identification_and_issue_id 1]
 
       # add a row to the automatic email log
-      db_dml email_log_insert {
+      db_dml email_log_insert_5 {
 	  insert into ec_automatic_email_log
 	  (user_identification_id, email_template_id, gift_certificate_id, date_sent)
 	  values
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.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="template_select">      
+<fullquery name="template_select_1">      
       <querytext>
       
 	select subject as email_subject, message as email_body, issue_type_list
@@ -37,12 +37,12 @@
 </fullquery>
 
  
-<fullquery name="template_select">      
+<fullquery name="template_select_3">      
       <querytext>
       
 	select subject as email_subject, message as email_body, issue_type_list
 	from ec_email_templates
-	where email_template_id = 1
+	where email_template_id = 3
     
       </querytext>
 </fullquery>
@@ -74,12 +74,12 @@
 </fullquery>
 
  
-<fullquery name="template_select">      
+<fullquery name="template_select_2">      
       <querytext>
       
 	select subject as email_subject, message as email_body, issue_type_list
 	from ec_email_templates
-	where email_template_id = 1
+	where email_template_id = 2
     
       </querytext>
 </fullquery>
@@ -97,18 +97,18 @@
 </fullquery>
 
  
-<fullquery name="template_select">      
+<fullquery name="template_select_4">      
       <querytext>
       
 	select subject as email_subject, message as email_body, issue_type_list
 	from ec_email_templates
-	where email_template_id = 1
+	where email_template_id = 4
     
       </querytext>
 </fullquery>
 
  
-<fullquery name="gift_certificate_select">      
+<fullquery name="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
@@ -120,30 +120,29 @@
 </fullquery>
 
  
-<fullquery name="template_select">      
+<fullquery name="template_select_6">      
       <querytext>
       
 	select subject as email_subject, message as email_body, issue_type_list
 	from ec_email_templates
-	where email_template_id = 1
+	where email_template_id = 6
     
       </querytext>
 </fullquery>
 
  
-<fullquery name="gift_certificate_select">      
+<fullquery name="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
       
-	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
-         where g.purchased_by=u.user_id
-           and g.gift_certificate_id=:gift_certificate_id
-    
       </querytext>
 </fullquery>
 
  
-<fullquery name="template_select">      
+<fullquery name="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>
@@ -168,13 +167,6 @@
 </fullquery>
 
  
-<fullquery name="user_identification_id_select">      
-      <querytext>
-      select user_identification_id from ec_user_identification where upper(email)=upper(:email)
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="user_identification_id_insert">      
       <querytext>
       
Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql	11 Jul 2001 05:22:37 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.xql	18 Jul 2001 23:46:14 -0000	1.3
@@ -11,7 +11,7 @@
 </fullquery>
 
  
-<fullquery name="ec_shipping_cost_summary.subcategories_select">      
+<fullquery name="ec_category_subcategory_and_subsubcategory_display.subcategories_select">      
       <querytext>
       
 		select subcategory_id from ec_subcategories where category_id = :category_id and subcategory_id in ([join $subcategory_list ", "]) order by subcategory_name
@@ -20,7 +20,7 @@
 </fullquery>
 
  
-<fullquery name="ec_shipping_cost_summary.category_name_select_1">      
+<fullquery name="ec_category_subcategory_and_subsubcategory_display.category_name_select_1">      
       <querytext>
       
                 select category_name from ec_categories where category_id = :category_id
@@ -29,7 +29,7 @@
 </fullquery>
 
  
-<fullquery name="ec_shipping_cost_summary.category_name_select_2">      
+<fullquery name="ec_category_subcategory_and_subsubcategory_display.category_name_select_2">      
       <querytext>
       
                 select category_name from ec_categories where category_id = :category_id
@@ -38,7 +38,7 @@
 </fullquery>
 
  
-<fullquery name="ec_shipping_cost_summary.subcategory_name_select_1">      
+<fullquery name="ec_category_subcategory_and_subsubcategory_display.subcategory_name_select_1">      
       <querytext>
       
                     select subcategory_name from ec_subcategories where subcategory_id = :subcategory_id
@@ -47,7 +47,7 @@
 </fullquery>
 
  
-<fullquery name="ec_shipping_cost_summary.subcategory_name_select_2">      
+<fullquery name="ec_category_subcategory_and_subsubcategory_display.subcategory_name_select_2">      
       <querytext>
       
 			select subsubcategory_name from ec_subsubcategories where subcategory_id = :subcategory_id and subsubcategory_id in ([join $subsubcategory_list ","]) order by subsubcategory_name
@@ -369,7 +369,7 @@
 </fullquery>
 
  
-<fullquery name="ec_admin_present_user.user_class_info_select">      
+<fullquery name="ec_user_class_display.user_class_info_select">      
       <querytext>
       
 	select c.user_class_name, m.user_class_approved_p, c.user_class_id
@@ -393,7 +393,7 @@
 </fullquery>
 
  
-<fullquery name="ec_create_new_session_if_necessary.state_name_from_usps_abbrev">      
+<fullquery name="ec_state_name_from_usps_abbrev.state_name_from_usps_abbrev">      
       <querytext>
       
 	select state_name from states where usps_abbrev =:usps_abbrev
@@ -402,7 +402,7 @@
 </fullquery>
 
  
-<fullquery name="ec_create_new_session_if_necessary.country_name_from_country_code">      
+<fullquery name="ec_country_name_from_country_code.country_name_from_country_code">      
       <querytext>
       
 	select country_name from country_codes where iso=:country_code
Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-oracle.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-oracle.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="ec_calculate_product_purchase_combinations.confirmed_orders_select">      
+<fullquery name="ec_sweep_for_cybercash_zombies.confirmed_orders_select">      
       <querytext>
       
       select order_id, ec_order_cost(order_id) as total_order_price
@@ -15,7 +15,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_sweep_for_cybercash_zombies.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -27,7 +27,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.gift_certificate_select">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.gift_certificate_select">      
       <querytext>
       
       select g.gift_certificate_id, t.transaction_id
@@ -40,7 +40,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.financial_transactions_update">      
       <querytext>
       
 	      update ec_financial_transactions
@@ -52,7 +52,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.gift_certificate_state_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.gift_certificate_state_update">      
       <querytext>
       
 	      update ec_gift_certificates
@@ -91,14 +91,14 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
-		  insert into ec_problems_log
-		  (problem_id, problem_date, problem_details, order_id)
-		  values
-		  (ec_problem_id_sequence.nextval, sysdate, :problem_details, :order_id)
-	      
+		 insert into ec_problems_log
+                 (problem_id, problem_date, problem_details, order_id)
+                 values
+                (ec_problem_id_sequence.nextval, sysdate, 'invalid input to ec_creditcard_authorization in ec_unauthorized_transactions', :order_id)
+
       </querytext>
 </fullquery>
 
@@ -122,7 +122,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
 		    insert into ec_problems_log
@@ -141,7 +141,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -167,7 +167,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unsettled_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -192,14 +192,14 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_unrefunded_transactions.financial_transactions_update">      
       <querytext>
       update ec_financial_transactions set refunded_date=sysdate where transaction_id=:transaction_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unrefunded_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-postgresql.xql	16 Jul 2001 20:07:06 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs-postgresql.xql	18 Jul 2001 23:46:14 -0000	1.4
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="ec_calculate_product_purchase_combinations.confirmed_orders_select">      
+<fullquery name="ec_sweep_for_cybercash_zombies.confirmed_orders_select">      
       <querytext>
       
       select order_id, ec_order_cost(order_id) as total_order_price
@@ -15,7 +15,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_sweep_for_cybercash_zombies.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -27,7 +27,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.gift_certificate_select">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.gift_certificate_select">      
       <querytext>
       
       select g.gift_certificate_id, t.transaction_id
@@ -40,7 +40,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.financial_transactions_update">      
       <querytext>
       
 	      update ec_financial_transactions
@@ -52,7 +52,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.gift_certificate_state_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.gift_certificate_state_update">      
       <querytext>
       
 	      update ec_gift_certificates
@@ -91,14 +91,14 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
-		  insert into ec_problems_log
-		  (problem_id, problem_date, problem_details, order_id)
-		  values
-		  (ec_problem_id_sequence.nextval, current_timestamp, :problem_details, :order_id)
-	      
+		insert into ec_problems_log
+                (problem_id, problem_date, problem_details, order_id)
+                 values
+                (ec_problem_id_sequence.nextval, current_timestamp, 'invalid input to ec_creditcard_authorization in ec_unauthorized_transactions', :order_id)
+
       </querytext>
 </fullquery>
 
@@ -122,7 +122,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
 		    insert into ec_problems_log
@@ -141,7 +141,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unauthorized_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -167,7 +167,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unsettled_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
@@ -192,14 +192,14 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_unrefunded_transactions.financial_transactions_update">      
       <querytext>
       update ec_financial_transactions set refunded_date=current_timestamp where transaction_id=:transaction_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.problems_log_insert">      
+<fullquery name="ec_unrefunded_transactions.problems_log_insert">      
       <querytext>
       
 		  insert into ec_problems_log
Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl	18 Jul 2001 18:19:01 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl	18 Jul 2001 23:46:14 -0000	1.3
@@ -345,8 +345,8 @@
 	  # wondering whether they should be concerned that failed_p is
 	  # 't'
 
-	  db_dml financial_transactions_update "update ec_financial_transactions set failed_p='t', to_be_captured_p='f' where transaction_id=:transaction_id"
-	  db_dml gift_certificate_state_update "update ec_gift_certificates set gift_certificate_state='failed_authorization' where gift_certificate_id=:gift_certificate_id"
+	  db_dml financial_transactions_update_1 "update ec_financial_transactions set failed_p='t', to_be_captured_p='f' where transaction_id=:transaction_id"
+	  db_dml gift_certificate_state_update_1 "update ec_gift_certificates set gift_certificate_state='failed_authorization' where gift_certificate_id=:gift_certificate_id"
 
 	  # send gift certificate order failure email
 	  ec_email_gift_certificate_order_failure $gift_certificate_id
@@ -389,7 +389,7 @@
 ad_proc ec_send_unsent_gift_certificate_recipient_email {} "Finds authorized_plus/minus_avs gift certificates for which email has not been sent to the recipient, sends the email, and records that it has been sent." {
     ns_log Notice "ec_send_unsent_gift_certificate_recipient_email starting"
 
-    db_foreach unset_gift_certificate_select {
+    db_foreach unsent_gift_certificate_select {
 	select gift_certificate_id
 	from ec_gift_certificates g
 	where (gift_certificate_state='authorized_plus_avs' or gift_certificate_state='authorized_minus_avs')
Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.xql	18 Jul 2001 23:46:14 -0000	1.2
@@ -59,7 +59,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.transaction_id_select">      
+<fullquery name="ec_sweep_for_cybercash_zombies.transaction_id_select">      
       <querytext>
       
 	      select max(transaction_id)
@@ -70,7 +70,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.avs_code_select">      
+<fullquery name="ec_sweep_for_cybercash_zombies.avs_code_select">      
       <querytext>
       
 		  select avs_code 
@@ -84,35 +84,35 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.order_state_update">      
+<fullquery name="ec_sweep_for_cybercash_zombies.order_state_update">      
       <querytext>
       update ec_orders set order_state=:new_order_state where order_id=:order_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.transaction_id_select">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.transaction_id_select">      
       <querytext>
       select transaction_id from ec_financial_transactions where gift_certificate_id=:gift_certificate_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.financial_transactions_update_1">      
       <querytext>
       update ec_financial_transactions set failed_p='t', to_be_captured_p='f' where transaction_id=:transaction_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.gift_certificate_state_update">      
+<fullquery name="ec_sweep_for_cybercash_zombie_gift_certificates.gift_certificate_state_update_1">      
       <querytext>
       update ec_gift_certificates set gift_certificate_state='failed_authorization' where gift_certificate_id=:gift_certificate_id
       </querytext>
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.unsent_orders_select">      
+<fullquery name="ec_send_unsent_new_order_email.unsent_orders_select">      
       <querytext>
       
 	select order_id
@@ -124,7 +124,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.unsent_gift_certificate_email">      
+<fullquery name="ec_send_unsent_new_gift_certificate_order_email.unsent_gift_certificate_email">      
       <querytext>
       
 	select gift_certificate_id
@@ -136,7 +136,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.unset_gift_certificate_select">      
+<fullquery name="ec_send_unsent_gift_certificate_recipient_email.unsent_gift_certificate_select">      
       <querytext>
       
 	select gift_certificate_id
@@ -155,7 +155,7 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.order_state_update">      
+<fullquery name="ec_delayed_credit_denied.order_state_update">      
       <querytext>
       update ec_orders set order_state='in_basket', saved_p='t' where order_id=:order_id
       </querytext>
@@ -207,9 +207,9 @@
 </fullquery>
 
  
-<fullquery name="ec_calculate_product_purchase_combinations.financial_transactions_update">      
+<fullquery name="ec_unmarked_transactions.financial_transactions_update">      
       <querytext>
-      update ec_financial_transactions set failed_p='t', to_be_captured_p='f' where transaction_id=:transaction_id
+      financial_transactions set marked_date=sysdate where transaction_id=:transaction_id
       </querytext>
 </fullquery>
 
@@ -226,7 +226,7 @@
 </fullquery>
 
  
-<fullquery name="ec_unauthorized_transactions.transaction_failed_update">      
+<fullquery name="ec_unsettled_transactions.transaction_failed_update">      
       <querytext>
       update ec_financial_transactions set failed_p='t' where transaction_id=:transaction_id
       </querytext>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	20 Apr 2001 20:51:13 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	18 Jul 2001 23:46:14 -0000	1.2
@@ -119,7 +119,7 @@
     }
 }
 
-proc_doc ec_ssl_available_p {} {
+ad_proc ec_ssl_available_p {} {
     Returns 1 if this AOLserver has either the nsssl module or nsopenssl module installed.
 } {
     if { [ns_config ns/server/[ns_info server]/modules nsssl] != "" } {
Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	18 Jul 2001 18:19:01 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	18 Jul 2001 23:46:14 -0000	1.3
@@ -674,7 +674,7 @@
     return $userag
 }
 
-proc_doc util_decode args {
+ad_proc util_decode args {
     like decode in sql
     Takes the place of an if (or switch) statement -- convenient because it's
     compact and you don't have to break out of an ns_write if you're in one.