From 571371faf5461d23f008c43e02c4596d23eb6173 Mon Sep 17 00:00:00 2001 From: Jean-Marc MEESSEN Date: Sat, 20 Jun 2020 22:05:51 +0200 Subject: [PATCH] Report parsing complete for Phone and CW --- cmd/parse_line.go | 47 +++++++++++++++++++++++++++++++++++++++--- cmd/parse_line_test.go | 33 +++++++++++++++++++++++++---- todo.md | 6 +++++- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/cmd/parse_line.go b/cmd/parse_line.go index c9f9362..ee974b1 100644 --- a/cmd/parse_line.go +++ b/cmd/parse_line.go @@ -32,6 +32,7 @@ type LogLine struct { QslMsg string Nickname string Mode string + ModeType string Band string BandLowerLimit float32 BandUpperLimit float32 @@ -46,11 +47,11 @@ type LogLine struct { RSTrcvd string } -var regexpIsBand = regexp.MustCompile("m$") var regexpIsFullTime = regexp.MustCompile("^[0-2]{1}[0-9]{3}$") var regexpIsTimePart = regexp.MustCompile("^[0-5]{1}[0-9]{1}$|^[1-9]{1}$") var regexpIsOMname = regexp.MustCompile("^@") var regexpIsGridLoc = regexp.MustCompile("^#") +var regexpIsRst = regexp.MustCompile("^[\\d]{1,3}$") // ParseLine cuts a FLE line into useful bits func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg string){ @@ -59,6 +60,9 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg //Flag telling that we are processing data to the right of the callsign isRightOfCall := false + //Flag used to know if we are parsing the Sent RST (first) or received RST (second) + haveSentRST := false + //TODO: Make something more intelligent //TODO: What happens if we have partial lines previousLine.Call = "" @@ -92,12 +96,15 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg if (logLine.RSTsent == "") || (logLine.RSTrcvd == "") { switch logLine.Mode { case "SSB", "AM", "FM" : + logLine.ModeType = "PHONE" logLine.RSTsent = "59" logLine.RSTrcvd = "59" case "CW", "RTTY", "PSK": + logLine.ModeType = "CW" logLine.RSTsent = "599" logLine.RSTrcvd = "599" case "JT65", "JT9", "JT6M", "JT4", "JT44", "FSK441", "FT8", "ISCAT", "MSK144", "QRA64", "T10", "WSPR" : + logLine.ModeType = "DIGITAL" logLine.RSTsent = "-10" logLine.RSTrcvd = "-10" } @@ -161,8 +168,41 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg if isRightOfCall { //This is probably a RST - //TODO: is it a number (or a data report) - //TODO: it is sent or rcvd + if regexpIsRst.MatchString(element) { + workRST := "" + switch len(element) { + case 1: + if logLine.ModeType == "CW" { + workRST = "5" + element + "9" + } else { + if logLine.ModeType == "PHONE" { + workRST = "5" + element + } + } + case 2: + if logLine.ModeType == "CW" { + workRST = element + "9" + } else { + if logLine.ModeType == "PHONE" { + workRST = element + } + } + case 3: + if logLine.ModeType == "CW" { + workRST = element + } else { + workRST = "*" + element + errorMsg = errorMsg + "Invalid report (" + element + ") for " + logLine.ModeType + " mode " + } + } + if haveSentRST { + logLine.RSTrcvd = workRST + } else { + logLine.RSTsent = workRST + haveSentRST = true + } + continue + } } //If we come here, we could not make sense of what we found @@ -188,6 +228,7 @@ func SprintLogRecord(logLine LogLine) (output string){ output = output + "QslMsg " + logLine.QslMsg + "\n" output = output + "Nickname " + logLine.Nickname + "\n" output = output + "Mode " + logLine.Mode + "\n" + output = output + "ModeType " + logLine.ModeType + "\n" output = output + "Band " + logLine.Band + "\n" output = output + " Lower " + fmt.Sprintf("%f", logLine.BandLowerLimit) + "\n" output = output + " Upper " + fmt.Sprintf("%f", logLine.BandLowerLimit) + "\n" diff --git a/cmd/parse_line_test.go b/cmd/parse_line_test.go index 2c3600d..b56fc66 100644 --- a/cmd/parse_line_test.go +++ b/cmd/parse_line_test.go @@ -20,7 +20,7 @@ func TestParseLine(t *testing.T) { { "Parse band and mode only", args{ inputStr: "40M cw", previousLine: LogLine{ Mode: "SSB", }}, - LogLine{ Band: "40m", BandLowerLimit: 7, BandUpperLimit: 7.3, Mode: "CW", RSTsent: "599", RSTrcvd: "599"}, "", + LogLine{ Band: "40m", BandLowerLimit: 7, BandUpperLimit: 7.3, Mode: "CW", ModeType: "CW", RSTsent: "599", RSTrcvd: "599"}, "", }, { "Parse for time", @@ -68,9 +68,34 @@ func TestParseLine(t *testing.T) { LogLine{ GridLoc: "grid", Mode: "SSB",}, "", }, { - "parse partial RST", - args{ inputStr: "1230 on4kjm 5", previousLine: LogLine{ Mode: "CW", }}, - LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "559", Mode: "CW",}, "", + "parse partial RST (sent) - CW", + args{ inputStr: "1230 on4kjm 5", previousLine: LogLine{ Mode: "CW", ModeType: "CW"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "559", Mode: "CW", ModeType: "CW"}, "", + }, + { + "parse partial RST (received) - CW", + args{ inputStr: "1230 on4kjm 5 44", previousLine: LogLine{ Mode: "CW", ModeType: "CW"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "559", RSTrcvd: "449", Mode: "CW", ModeType: "CW"}, "", + }, + { + "parse full RST (received) - CW", + args{ inputStr: "1230 on4kjm 5 448", previousLine: LogLine{ Mode: "CW", ModeType: "CW"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "559", RSTrcvd: "448", Mode: "CW", ModeType: "CW"}, "", + }, + { + "parse partial report (sent) - FM", + args{ inputStr: "1230 on4kjm 5", previousLine: LogLine{ Mode: "FM", ModeType: "PHONE"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "55", Mode: "FM", ModeType: "PHONE"}, "", + }, + { + "parse partial report (received) - FM", + args{ inputStr: "1230 on4kjm 5 44", previousLine: LogLine{ Mode: "FM", ModeType: "PHONE"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "55", RSTrcvd: "44", Mode: "FM", ModeType: "PHONE"}, "", + }, + { + "Incompatible report", + args{ inputStr: "1230 on4kjm 5 599", previousLine: LogLine{ Mode: "FM", ModeType: "PHONE"}}, + LogLine{ Call: "ON4KJM", Time: "1230", RSTsent: "55", RSTrcvd: "*599", Mode: "FM", ModeType: "PHONE"}, "Invalid report (599) for PHONE mode ", }, } for _, tt := range tests { diff --git a/todo.md b/todo.md index 02113f4..67b12dc 100644 --- a/todo.md +++ b/todo.md @@ -12,7 +12,7 @@ ## Input processing -* [ ] infer rst +* [ ] infer RST * [ ] DATE keyword is now optional * [ ] New MYGRID keyword * [ ] Create the logic to take over from the previous line @@ -22,3 +22,7 @@ * [ ] Support date increment * [ ] decode and check frequency +## Later +* [ ] Process contest reports +* [ ] Infer digital mode report +