Index: openacs-4/packages/ecommerce/www/admin/orders/track.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/track.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/track.tcl	23 Oct 2001 05:56:16 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/track.tcl	16 Feb 2002 23:32:07 -0000	1.3
@@ -31,28 +31,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 {(<TABLE WIDTH="290".*?</TABLE>).*?(<TABLE BORDER=0 CELLPADDING=2 CELLSPACING=1 WIDTH=462>.*?</TABLE>)} $page_from_fedex match detailed_info scan_activity
+	regexp {(<TABLE WIDTH="290".*?</TABLE>).*?(<TABLE WIDTH="460" BORDER="0" CELLPADDING="2" CELLSPACING="1">.*?</TABLE>)} $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 {(<TR><TD[^>]*>Tracking Number:.*</TABLE>).*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 {<img.*?>} $ups_info "" ups_info
 	    set carrier_info "<table noborder>$ups_info"
 	}
     } {