dominic/FLEcli
1
0
Fork 0
mirror of https://github.com/on4kjm/FLEcli.git synced 2025-01-18 13:01:09 +01:00
Code Issues Releases Activity

Some display tweeking after testing with real files

Browse source
This commit is contained in:
Jean-Marc Meessen 2020-06-23 12:02:27 +02:00
parent 10ca0b86e0
commit 36dd84d369
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/display.go
View file

@ -64,7 +64,7 @@ func SprintHeaderValues(logLine LogLine) (output string){
return output
}
// Date, Time, band, mode, call, report sent, report rcvd, Notes
var logLineFormat = "%10s %4s %4s %4s %10s %4s %4s %s \n"
var logLineFormat = "%-10s %-4s %-4s %-4s %-10s %-4s %-4s %s \n"
// SprintColumnTitles displays the column titles for a log line
func SprintColumnTitles(logLine LogLine) (output string){

10
cmd/parse_line.go
View file

@ -19,7 +19,6 @@ limitations under the License.
import (
"regexp"
"strings"
"fmt"
)
//TODO: validate a record for minimal values
@ -75,6 +74,9 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg
previousLine.RSTrcvd = ""
previousLine.SOTA = ""
previousLine.WWFF = ""
previousLine.OMname = ""
previousLine.GridLoc = ""
previousLine.Comment = ""
logLine = previousLine
//TODO: what happens when we have <> or when there are multiple comments
@ -82,13 +84,11 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg
comment,inputStr := getBraketedData(inputStr, COMMENT)
if comment != "" {
logLine.Comment = comment
fmt.Println("Cleaned input string: ", inputStr)
}
QSLmsg,inputStr := getBraketedData(inputStr, QSL)
if QSLmsg != "" {
logLine.QSLmsg = QSLmsg
fmt.Println("Cleaned input string: ", inputStr)
}
@ -231,10 +231,6 @@ func ParseLine(inputStr string, previousLine LogLine) (logLine LogLine, errorMsg
_, logLine.RSTrcvd = getDefaultReport(logLine.Mode)
}
//Debug
fmt.Println(elements, len(elements))
fmt.Println("\n", SprintLogRecord(logLine))
return logLine, errorMsg
}

4
test/data/ON4KJM@ONFF-025920200524.txt
View file

@ -13,14 +13,14 @@ date 2020-05-24
20 iw3iee
25 oe7hhw 5 9
37 ol90crk 5 9
14.047 42 oe6jtd 3 9 Name Joe, qth Gratz
14.047 42 oe6jtd 3 9 <Name Joe, QTH Gratz>
14.060 1405 hb9fbg/qrp 5 9
30m cw
10.124 1415 hb9ijc 8 9
25 f6acv 7 9
27 dl5sfc/p 5 5
29 dl6ta 449 5 qrpp
29 dl6ta 449 5 <qrpp>
pa1tt
35 ik4gbu 5 9
38 oh6mps