From kde-commits Tue Sep 11 17:28:08 2018 From: Volker Krause Date: Tue, 11 Sep 2018 17:28:08 +0000 To: kde-commits Subject: [kitinerary] src/extractors: Relax check-in time regexp Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153668690409254 Git commit f86817f7c9b54f812b7b7a45131ab4edf8c54a5c by Volker Krause. Committed on 11/09/2018 at 17:27. Pushed by vkrause into branch 'master'. Relax check-in time regexp This can be both "( - )" and "(from/until )". M +2 -2 src/extractors/booking.js https://commits.kde.org/kitinerary/f86817f7c9b54f812b7b7a45131ab4edf8c54a5c diff --git a/src/extractors/booking.js b/src/extractors/booking.js index 256850d..d329315 100644 --- a/src/extractors/booking.js +++ b/src/extractors/booking.js @@ -23,8 +23,8 @@ regExMap['en_US']['bookingRef'] =3D /Booking number +([0-= 9]*)\s+/; // 1: adress, 2: city, 3:postal code, 4: country, 5: phone regExMap['en_US']['hotelInformation'] =3D / *(.+), (.+), (.+), (.+) -\s+Ph= one: (\+[0-9]*)\s+/; regExMap['en_US']['hotelName'] =3D /\[checkmark\.png\] (.*) is expecting y= ou on/; -regExMap['en_US']['arrivalDate'] =3D /Check-in *([A-z]+ [0-9]{1,2} [A-z]+ = [0-9]+) \(([0-9]{1,2}:[0-9]{2}) - ([0-9]{1,2}:[0-9]{2})\)/; -regExMap['en_US']['departureDate'] =3D /Check-out *([1-z]+ [0-9]{1,2} [A-z= ]+ [0-9]+) \([0-9]{1,2}:[0-9]{2} - ([0-9]{1,2}:[0-9]{2})\)/; +regExMap['en_US']['arrivalDate'] =3D /Check-in *([A-z]+ [0-9]{1,2} [A-z]+ = [0-9]+) \(f?r?o?m? ?([0-9]{1,2}:[0-9]{2})[^\)]*\)/; +regExMap['en_US']['departureDate'] =3D /Check-out *([1-z]+ [0-9]{1,2} [A-z= ]+ [0-9]+) \(.* ([0-9]{1,2}:[0-9]{2})\)/; regExMap['en_US']['person'] =3D /Guest name +(.*) Edit guest name/; regExMap['en_US']['dateFormat'] =3D "dddd d MMMM yyyy hh:mm"; =20