Index: openacs-4/packages/ecommerce/ecommerce.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/ecommerce/ecommerce.info 29 Jan 2002 00:22:50 -0000 1.15 +++ openacs-4/packages/ecommerce/ecommerce.info 31 Jan 2002 06:41:59 -0000 1.16 @@ -1001,6 +1001,7 @@ + Index: openacs-4/packages/ecommerce/sql/postgresql/ecommerce-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/ecommerce-drop.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/sql/postgresql/ecommerce-drop.sql 7 Jan 2002 02:02:16 -0000 1.6 +++ openacs-4/packages/ecommerce/sql/postgresql/ecommerce-drop.sql 31 Jan 2002 06:41:59 -0000 1.7 @@ -220,6 +220,7 @@ drop table ec_products_audit; drop view ec_products_searchable; drop view ec_products_displayable; +\i ec-product-sc-drop.sql drop table ec_products; -- nuke all created objects @@ -234,6 +235,7 @@ select inline_0 (); drop function inline_0 (); +\i ec-product-package-drop.sql drop view ec_subsubcategories_augmented; drop trigger ec_subsubcategories_audit_tr on ec_subsubcategories; @@ -265,6 +267,4 @@ drop sequence ec_template_id_seq; \i pl-sql-utilities-drop.sql -\i ec-product-package-drop.sql -\i acs-geo-tables-drop.sql -\i ec-product-sc-drop.sql + Index: openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/Attic/ec-style-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl 18 Jul 2001 18:19:01 -0000 1.2 +++ openacs-4/packages/ecommerce/tcl/ec-style-procs.tcl 31 Jan 2002 06:41:59 -0000 1.3 @@ -17,14 +17,15 @@ given in the AOLserver Tcl API docs for ns_register_adptag) } { - ns_share ec_styletag - ns_share ec_styletag_source_file set generated_proc_name "ec_style_$tagname" ad_proc $generated_proc_name {{string ""} {tagset ""}} "Proc generated by ec_register_styletag to support the $tagname ADP tag." $proc_body + # let's register the ADP tag now ns_register_adptag $tagname "/$tagname" $generated_proc_name - set ec_styletag($tagname) $tag_documentation - set ec_styletag_source_file($tagname) [info script] + + # Store the tag and the script for later reference by doc/styles and doc/style-one + nsv_set ec_styletag $tagname $tag_documentation + nsv_set ec_styletag_source_file $tagname [info script] } ad_proc ec_style_template_root_internal {} { returns template root } { Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 29 Jan 2002 00:11:46 -0000 1.7 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 31 Jan 2002 06:41:59 -0000 1.8 @@ -18,15 +18,10 @@ return filter_ok } -ns_share -init {set ec_user_session_logout_installed 0} ec_user_session_logout_installed +ns_register_filter postauth GET /register/logout* ec_user_session_logout +ns_register_filter postauth POST /register/user-login* ec_user_session_logout +ns_register_filter postauth GET /register/user-login* ec_user_session_logout -if {!$ec_user_session_logout_installed} { - set ec_user_session_logout_installed 1 - ns_register_filter postauth GET /register/logout* ec_user_session_logout - ns_register_filter postauth POST /register/user-login* ec_user_session_logout - ns_register_filter postauth GET /register/user-login* ec_user_session_logout -} - ad_proc ec_system_name {} { @return ec_system_name } { 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.5 -r1.6 --- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl 24 Nov 2001 03:50:55 -0000 1.5 +++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl 31 Jan 2002 06:41:59 -0000 1.6 @@ -731,9 +731,7 @@ ## Schedule these procedures - -ns_share -init {set ec_procs_scheduled_p 0} ec_procs_scheduled_p - +set ec_procs_scheduled_p 0 set ep [util_memoize {ad_parameter -package_id [ec_id] EnabledP ecommerce 0} [ec_cache_refresh]] if { !$ec_procs_scheduled_p && $ep} { Index: openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 20 Apr 2001 20:51:13 -0000 1.1 +++ openacs-4/packages/ecommerce/tcl/ecommerce-user-contributions-summary-procs.tcl 31 Jan 2002 06:41:59 -0000 1.2 @@ -12,9 +12,6 @@ } - -ns_share ad_user_contributions_summary_proc_list - if { ![info exists ad_user_contributions_summary_proc_list] || [util_search_list_of_lists $ad_user_contributions_summary_proc_list "Ecommerce" 0] == -1 } { lappend ad_user_contributions_summary_proc_list [list "Ecommerce" ecommerce_user_contributions 0] } Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/credit-card-correction-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/credit-card-correction-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/gift-certificate-order-4-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/gift-certificate-order-4-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/www/process-payment-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-payment-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/process-payment-oracle.xql 10 Jul 2001 20:42:02 -0000 1.1 +++ openacs-4/packages/ecommerce/www/process-payment-oracle.xql 31 Jan 2002 06:41:59 -0000 1.2 @@ -1,20 +1,12 @@ - oracle8.1.6 + oracle8.1.6 - - + + select ec_gift_certificate_balance(:user_id) from dual - - + + - - - - select ec_creditcard_id_sequence.nextval from dual - - - - Index: openacs-4/packages/ecommerce/www/process-payment-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-payment-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/process-payment-postgresql.xql 10 Jul 2001 20:42:02 -0000 1.1 +++ openacs-4/packages/ecommerce/www/process-payment-postgresql.xql 31 Jan 2002 06:41:59 -0000 1.2 @@ -1,20 +1,12 @@ - postgresql7.1 + postgresql7.1 - - + + select ec_gift_certificate_balance(:user_id) - - - - - - - select ec_creditcard_id_sequence.nextval - - - - + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/shipping-address-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/shipping-address-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/shipping-address-international-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/shipping-address-international-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/cat/category-add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/cat/category-add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-oracle.xql 10 Jul 2001 20:33:53 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-oracle.xql 31 Jan 2002 06:41:59 -0000 1.2 @@ -1,25 +1,15 @@ - oracle8.1.6 + oracle8.1.6 - - - -select u.email as user_email, id.email as id_email - from cc_users u, ec_user_identification id - where id.user_id = u.user_id(+) - and id.user_identification_id=:user_identification_id + + + select u.email as user_email, id.email as id_email + from cc_users u, ec_user_identification id + where id.user_id = u.user_id(+) + and id.user_identification_id=:user_identification_id + + - - - - - - - select ec_action_id_sequence.nextval from dual - - - - - + Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-postgresql.xql 10 Jul 2001 20:33:53 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-postgresql.xql 31 Jan 2002 06:41:59 -0000 1.2 @@ -3,11 +3,13 @@ postgresql7.1 - - - select ec_action_id_sequence.nextval - - - + + + select u.email as user_email, id.email as id_email + from ec_user_identification id + left join cc_users u using (user_id) + and id.user_identification_id=:user_identification_id + + Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send.xql 10 Jul 2001 20:33:53 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send.xql 31 Jan 2002 06:41:59 -0000 1.2 @@ -1,23 +1,12 @@ - - - -select u.email as user_email, id.email as id_email - from ec_user_identification id - left join cc_users u using (user_id) - where id.user_identification_id=:user_identification_id - - - - - - - - select first_names || ' ' || last_name from cc_users where user_id=:customer_service_rep - - - - + + + select first_names || ' ' || last_name + from cc_users + where user_id=:customer_service_rep + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/address-add-3-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/address-add-3-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/fulfill-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/fulfill-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/items-add-3-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/items-add-3-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/items-return-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/orders/items-return-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/offer-add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/offer-add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/recommendation-add-3-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/recommendation-add-3-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/review-add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/products/review-add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/templates/add-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/templates/add-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/user-classes/add-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/ecommerce/www/admin/user-classes/add-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/ecommerce/www/doc/style-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/Attic/style-one.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/doc/style-one.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/doc/style-one.tcl 31 Jan 2002 06:42:00 -0000 1.2 @@ -11,15 +11,10 @@ style_name:notnull } - -ns_share ad_styletag -ns_share ad_styletag_source_file - - doc_return 200 text/html "[ad_admin_header "One Style"]

One Style

-defined in $ad_styletag_source_file($style_name), part of the +defined in [nsv_get ec_styletag_source_file $style_name], part of the style module of the ArsDigita Community System
@@ -30,13 +25,13 @@
-$ad_styletag($style_name) +[nsv_get ec_styletag $style_name]
Source code:
-[ad_quotehtml [info body ad_style_$style_name]]
+[ad_quotehtml [info body ec_style_$style_name]]
 
[ad_admin_footer] Index: openacs-4/packages/ecommerce/www/doc/styles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/Attic/styles.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/doc/styles.tcl 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/ecommerce/www/doc/styles.tcl 31 Jan 2002 06:42:00 -0000 1.2 @@ -12,10 +12,6 @@ sort_by:optional } - -ns_share ad_styletag -ns_share ad_styletag_source_file - # we assume that we get a list of lists, each one containing # {proc_name filename} (i.e., a Tcl list in its own right) @@ -48,16 +44,16 @@
This page lists those styles that the programmers have defined -using ec_register_styletag (defined in /tcl/ad-style.tcl). +using ec_register_styletag (defined in ecommerce/tcl/ec-style-procs.tcl).

" set list_of_lists [list] -foreach style_name [array names ad_styletag] { - lappend list_of_lists [list $style_name $ad_styletag_source_file($style_name)] +foreach style_name [nsv_array names ec_styletag] { + lappend list_of_lists [list $style_name [nsv_get ec_styletag_source_file $style_name]] } if { [info exists sort_by] && $sort_by == "name" } {