ParcelForce: Should not trigger for non-UK parcels (#3907)

* ParcelForce: Should not trigger for non-UK parcels

* ParcelForce: Starting with KB clashes with Microsoft KB Articles; AFAIK this isn't a valid parcelforce tracking number anyway

* ParcelForce: Working around #3986
master
Rob Emery 2017-03-07 21:21:34 +00:00 committed by PJ Hampton
parent 308e0675f9
commit 63e02972da
2 changed files with 5 additions and 3 deletions

View File

@ -14,7 +14,7 @@ my $tracking_qr = qr/package|parcel|track(?:ing|)|num(?:ber|)|\#/i;
# note: parcelforce format listed at http://www.parcelforce.com/help-information/frequently-asked-questions/track-parcel#2
my $parcel
= qr/[A-Z]{2}[0-9]{7}|[A-Z]{4}[0-9]{10}|[A-Z]{2}[0-9]{9}GB|[0-9]{12}|[A-Z]{2}[0-9]{9}[A-Z]{2}/i;
= qr/[A-Z]{2}[0-9]{7}|[A-Z]{4}[0-9]{10}|[A-Z]{2}[0-9]{9}GB|[0-9]{12}/i;
triggers query_nowhitespace_nodash => qr/
^$rm_qr.*?(?<parcel_number>$parcel)$|
^(?<parcel_number>$parcel).*?$rm_qr$|
@ -24,7 +24,7 @@ triggers query_nowhitespace_nodash => qr/
handle query_nowhitespace_nodash => sub {
my $parcel_number = $+{parcel_number};
if ($parcel_number && $parcel_number !~ /^(isbn|luhn)/i) {
if ($parcel_number && $parcel_number !~ /^(isbn|luhn|kb)/i) {
return $parcel_number,
heading => 'Parcelforce Tracking',

View File

@ -29,7 +29,9 @@ ddg_goodie_test(
html =>
qq(Track this parcel at <a href="http://www.parcelforce.com/track-trace?trackNumber=PBTM8237263001">Parcelforce</a>.)
),
'luhn 1234554651' => undef
'luhn 1234554651' => undef,
'cc737873589FR' => undef,
'KB2553549' => undef
);
done_testing;