Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

SimpleFLE: Implement Name and QSL-Msg, refinment of locator-matching

Browse Source
This commit is contained in:
DJ3CE
2025-01-09 00:30:09 +01:00
committed by DJ3CE
parent 361bfc7088
commit cc2fce9214
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
assets/js/sections/simplefle.js
View File

@@ -242,15 +242,17 @@ function handleInput() {
var add_info = {};
// First, search for <...>-Patterns, which may contain comments (... or additional fields)
let addInfoMatches = row.matchAll(/<([^>]*)>/g);
let addInfoMatches = row.matchAll(/<([^>]*)>|\[([^\]]*)\]/g);
addInfoMatches.forEach((item) => {
row = row.replace(item[0], "");
let kv;
if (kv = item[1].match(/^([a-z_]+): *(.*)$/)) {
add_info[kv[1]] = kv[2];
} else {
add_info.comment = (('comment' in add_info)?add_info.comment+' ': '')+item[1];
}
row = row.replace(item[0], "");
let kv;
if (item[0][0] == '<' && (kv = item[1].match(/^([a-z_]+): *(.*)$/))) {
add_info[kv[1]] = kv[2];
} else if (item[0][0] == '[') {
add_info.qslmsg = item[2];
} else {
add_info.comment = (('comment' in add_info)?add_info.comment+' ': '')+item[1];
}
});
// Now split the remaining line by spaces and match patterns on those
@@ -315,9 +317,9 @@ function handleInput() {
callsign = item.toUpperCase();
call_rec = true;
} else if (
item.match(/^[A-R]{2}[0-9]{2}([A-X]{2}([0-9]{2}([A-X]{2})?)?)?$/i)
parts = item.match(/(?<=^#?)[A-R]{2}[0-9]{2}([A-X]{2}([0-9]{2}([A-X]{2})?)?)?$/i)
) {
gridsquare = item.toUpperCase();
gridsquare = parts[0].toUpperCase();
} else if (itemNumber > 0 && item.match(/^[-+]\d{1,2}$|^\d{1,3}$|^\d{1,3}[-+]d{1,2}$/)) {
if (rst_s === null) {
rst_s = item;
@@ -339,6 +341,8 @@ function handleInput() {
srx = parts[5];
}
}
} else if (itemNumber > 0 && (parts = item.match(/(?<=^@)[A-Za-z]+/))) {
add_info.name = parts[0];
}
itemNumber = itemNumber + 1;