From 3441588d8b5ceb9b4c19ccea9089c3d6355d1947 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 17 May 2024 17:15:13 +0300 Subject: [PATCH] Bugfix : Updated the logging part. In case of QSO match, some bad logging was done --- logXchecker.py | 6 +++--- parse_cabrillo.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/logXchecker.py b/logXchecker.py index 475d531..f9176ce 100644 --- a/logXchecker.py +++ b/logXchecker.py @@ -118,8 +118,8 @@ def print_human_friendly_output(lfmodule, output, verbose=False): continue for err in _details['qso_errors']: print(' - {}'.format(err)) - # for vld in _details['qso_valid']: - # print(' - {}'.format(vld)) + for vld in _details['qso_valid']: + print(' - {}'.format(vld)) print('--------') @@ -253,7 +253,7 @@ def main(): if qso.cc_confirmed is False: _cc_errors.append('{} : {}'.format(qso.qso_line, qso.cc_error)) else: - _cc_valid.append('{} : {} : {}'.format(qso.qso_line, qso.points, qso.cc_confirmed)) + _cc_valid.append('{} , points {} , confirmed {}'.format(qso.qso_line, qso.points, qso.cc_confirmed)) op_output[lfmodule.INFO_BANDS][_log.band]['qso_errors'] = _cc_errors op_output[lfmodule.INFO_BANDS][_log.band]['qso_valid'] = _cc_valid diff --git a/parse_cabrillo.py b/parse_cabrillo.py index b9a91b1..9a9ed91 100644 --- a/parse_cabrillo.py +++ b/parse_cabrillo.py @@ -265,8 +265,8 @@ def __init__(self, qso_cabrillo_lib=None, qso_line_number=None, rules=None): self.errors = [] self.cc_confirmed = None # possible values: True, False - self.cc_error = [] # here we store errors from cross-check - self.points = None # if qso is confirmed we store here the calculated points (multiplier included) + self.cc_error = [] # here we store errors from cross-check + self.points = None # if qso is confirmed we store here the calculated points (multiplier included) self.qso_fields = {'freq': None, 'mode': None, @@ -451,8 +451,8 @@ def crosscheck_logs(operator_instances, rules, band_nr): operator_instances[callsign1].points_multipliers += 1 qso1.cc_error = [] else: - qso1.cc_confirmed = False - qso1.cc_error = 'No qso found on {} log'.format(callsign2) + if qso1.cc_confirmed == False: + qso1.cc_error = 'No qso found on {} log'.format(callsign2) def compare_qso(log1, qso1, log2, qso2):