Index: openacs-4/packages/ecommerce/www/track.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/track.tcl 23 Oct 2001 05:48:48 -0000 1.3
+++ openacs-4/packages/ecommerce/www/track.tcl 16 Feb 2002 23:32:07 -0000 1.4
@@ -42,28 +42,25 @@
set carrier_info ""
if { $carrier == "FedEx" } {
- ### from Bart T.
set fedex_url "http://www.fedex.com/cgi-bin/tracking?tracknumbers=$tracking_number&action=track&language=english&cntry_code=us"
with_catch errmsg {
set page_from_fedex [ns_httpget $fedex_url]
- ### from Bart T.
- regexp {(
).*?()} $page_from_fedex match detailed_info scan_activity
+ regexp {().*?()} $page_from_fedex match detailed_info scan_activity
+ # Remove links
+ regsub -all -nocase {*?a.*?>} $scan_activity "" scan_activity
set carrier_info "$detailed_info $scan_activity"
} {
set carrier_info "Unable to retrieve data from FedEx."
}
} elseif { [string match "UPS*" $carrier] } {
- ### from Bart T.
set ups_url "http://wwwapps.ups.com/etracking/tracking.cgi?submit=Track&InquiryNumber1=$tracking_number&TypeOfInquiryNumber=T&build_detail=yes"
with_catch errmsg {
- ### from Bart T.
set ups_page [ns_httpget $ups_url]
- # UPS needs this magic line1 to get to the more interesting detail page.
- ### from Bart T.
if { ![regexp {(]*>Tracking Number:.* |
).*Tracking results provided by UPS} $ups_page match ups_info] } {
set carrier_info "Unable to parse detail data from UPS."
} else {
- ### from Bart T.
+ # Remove spacer images
+ regsub -all -nocase {} $ups_info "" ups_info
set carrier_info "