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

bug fixes

Browse Source
This commit is contained in:
DB4SCW
2024-11-18 14:43:08 +00:00
parent 0b2ea8c6bc
commit eccf8ac576
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/libraries/Cbr_parser.php
View File

@@ -1,10 +1,10 @@
<?php
class CBR_Parser
{
public function parse_from_file($filename) : array
public function parse_from_file($filename, $serial_number_present = false) : array
{
//load file, call parser
return $this->parse(mb_convert_encoding(file_get_contents($filename), "UTF-8"));
return $this->parse(mb_convert_encoding(file_get_contents($filename), "UTF-8"), $serial_number_present);
}
public function parse(string $input, $serial_number_present = false) : array
@@ -47,7 +47,7 @@ class CBR_Parser
$parts = explode(': ', $line, 2);
//collect header information
$header[$parts[0]] = $parts[1];
$header[$parts[0]] = preg_replace('/\s+/', '', $parts[1]);
//skip to next line
continue;
@@ -104,7 +104,7 @@ class CBR_Parser
//abort if basic things (Callsign and Contest ID) are not included in the header
$header_fields = array_keys($header);
if(!in_array('CALLSIGN', $header_fields) or !in_array('CONTEST', $header)){
if(!in_array('CALLSIGN', $header_fields) or !in_array('CONTEST', $header_fields)){
$result = [];
$result["HEADER"] = $header;
$result["QSOS"] = [];