From 371aa1e20c8db110797db3dbe3b1fb1da8a71798 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Thu, 26 Jul 2018 20:46:08 -0400 Subject: [PATCH] Fixed callsign parsing expression --- varicode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varicode.cpp b/varicode.cpp index 269b248..e459608 100644 --- a/varicode.cpp +++ b/varicode.cpp @@ -31,7 +31,7 @@ const int nalphabet = 41; QString alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ+-./?"}; QString grid_pattern = {R"((?[A-R]{2}[0-9]{2})+)"}; QString orig_compound_callsign_pattern = {R"((?(\d|[A-Z])+\/?((\d|[A-Z]){2,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?))"}; -QString compound_callsign_pattern = {R"((?([A-Z0-9]{1,4}\/)?([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?(\/[A-Z0-9]{1,4})?))"}; +QString compound_callsign_pattern = {R"((?\b([A-Z0-9]{1,4}\/)?([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?(\/[A-Z0-9]{1,4})?)\b)"}; QString pack_callsign_pattern = {R"(([0-9A-Z ])([0-9A-Z])([0-9])([A-Z ])([A-Z ])([A-Z ]))"}; QString callsign_alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ "};