|
|
|
@ -21,7 +21,6 @@ import (
|
|
|
|
"regexp"
|
|
|
|
"regexp"
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
//"fmt"
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
// LogLine is used to store all the data of a single log line
|
|
|
|
// LogLine is used to store all the data of a single log line
|
|
|
|
@ -70,6 +69,7 @@ var regexpDatePattern = regexp.MustCompile(`^(\d{2}|\d{4})[-/ .]\d{1,2}[-/ .]\d{
|
|
|
|
var regexpIsDateKeyWord = regexp.MustCompile(`(?i)^date$`)
|
|
|
|
var regexpIsDateKeyWord = regexp.MustCompile(`(?i)^date$`)
|
|
|
|
var regexpDayIncrementPattern = regexp.MustCompile(`^\+*$`)
|
|
|
|
var regexpDayIncrementPattern = regexp.MustCompile(`^\+*$`)
|
|
|
|
var regexpIsDayKeyword = regexp.MustCompile(`(?i)^day$`)
|
|
|
|
var regexpIsDayKeyword = regexp.MustCompile(`(?i)^day$`)
|
|
|
|
|
|
|
|
var regexpKhzPartOfQrg = regexp.MustCompile(`\.\d+`)
|
|
|
|
|
|
|
|
|
|
|
|
// ParseLine cuts a FLE line into useful bits
|
|
|
|
// ParseLine cuts a FLE line into useful bits
|
|
|
|
func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg string) {
|
|
|
|
func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg string) {
|
|
|
|
@ -174,17 +174,26 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg
|
|
|
|
logLine.Band = strings.ToLower(element)
|
|
|
|
logLine.Band = strings.ToLower(element)
|
|
|
|
logLine.BandLowerLimit = bandLowerLimit
|
|
|
|
logLine.BandLowerLimit = bandLowerLimit
|
|
|
|
logLine.BandUpperLimit = bandUpperLimit
|
|
|
|
logLine.BandUpperLimit = bandUpperLimit
|
|
|
|
|
|
|
|
//As a new band is defined, we reset the stored frequency (from previous lines)
|
|
|
|
|
|
|
|
// This assumes that the band is defined before frequency
|
|
|
|
|
|
|
|
logLine.Frequency = ""
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Is it a Frequency?
|
|
|
|
// Is it a Frequency?
|
|
|
|
if regexpIsFreq.MatchString(element) {
|
|
|
|
if regexpIsFreq.MatchString(element) {
|
|
|
|
|
|
|
|
khzPart := regexpKhzPartOfQrg.FindStringSubmatch(element)
|
|
|
|
var qrg float64
|
|
|
|
var qrg float64
|
|
|
|
qrg, _ = strconv.ParseFloat(element, 32)
|
|
|
|
qrg, _ = strconv.ParseFloat(element, 32)
|
|
|
|
if (logLine.BandLowerLimit != 0.0) && (logLine.BandUpperLimit != 0.0) {
|
|
|
|
if (logLine.BandLowerLimit != 0.0) && (logLine.BandUpperLimit != 0.0) {
|
|
|
|
if (qrg >= logLine.BandLowerLimit) && (qrg <= logLine.BandUpperLimit) {
|
|
|
|
if (qrg >= logLine.BandLowerLimit) && (qrg <= logLine.BandUpperLimit) {
|
|
|
|
//TODO: print 3f or more is available
|
|
|
|
//Increase precision to half Khz if data is available
|
|
|
|
|
|
|
|
if len(khzPart[0]) > 4 {
|
|
|
|
|
|
|
|
//The "." is part of the returned string
|
|
|
|
|
|
|
|
logLine.Frequency = fmt.Sprintf("%.4f", qrg)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
logLine.Frequency = fmt.Sprintf("%.3f", qrg)
|
|
|
|
logLine.Frequency = fmt.Sprintf("%.3f", qrg)
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
logLine.Frequency = ""
|
|
|
|
logLine.Frequency = ""
|
|
|
|
errorMsg = errorMsg + "Frequency [" + element + "] is invalid for " + logLine.Band + " band."
|
|
|
|
errorMsg = errorMsg + "Frequency [" + element + "] is invalid for " + logLine.Band + " band."
|
|
|
|
@ -196,7 +205,7 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Is it a call sign ?
|
|
|
|
// Is it a call sign ?
|
|
|
|
//FIXME:
|
|
|
|
//FIXME: (don't remember what)
|
|
|
|
if validCallRegexp.MatchString(strings.ToUpper(element)) {
|
|
|
|
if validCallRegexp.MatchString(strings.ToUpper(element)) {
|
|
|
|
//If it starts with "#",it is a grid definition and not a call
|
|
|
|
//If it starts with "#",it is a grid definition and not a call
|
|
|
|
if element[0] != '#' {
|
|
|
|
if element[0] != '#' {
|
|
|
|
|
Jean-Marc MEESSEN
3 years ago
committed by
GitHub