Closes #669

ea4k · Feb 15, 2024 · eda1c62 · eda1c62
1 parent b9998eb
commit eda1c62
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/src/Changelog b/src/Changelog
@@ -8,7 +8,9 @@ TBD - 2.3.4
 WIP: - Bugfix: Keep data of SAT tab when entering a QSO stopped working. (TNX EA5WA)
 - BugFix: When editing a split QSO, if TX Frequency is modified, split is disabled and frequencies made equal. (EA5WA)
 - BugFix: Incorrect CQ zone saved to DataBase (Closes #666) (EA5WA)
+- BugFix: FO/x calls are not properly identified/stored (Closes #677) (EA5WA)
 - BugFix: Minor CQz & ITUz bugfixes that could, potentially accept CQ or ITU zones being 0.
+- Bugfix: Several fields do not meet ADIF specification (Closes #669)
 - Translations: Danish (TNX Peter), Russian (YL3GBC), Spanish (EA4K), Ukrainian (YL3GBC)
 
 Dec 2023 - 2.3.3

diff --git a/src/adif.cpp b/src/adif.cpp
@@ -618,7 +618,7 @@ bool Utilities::isValidSponsor(const QString &_s)
 QString Adif::getADIFField(const QString &_fieldName, const QString &_data)
 {// Receives the ADIF field and the data and returns the ADIF field with a blank space at the end.
     // Check if _fieldName is a valid ADIF
-    qDebug() << Q_FUNC_INFO << " - " << _fieldName << "/" << _data;
+    //qDebug() << Q_FUNC_INFO << " - " << _fieldName << "/" << _data;
     if ((_data.length()<=0) || (_data.isNull()))
     {
         //qDebug() << Q_FUNC_INFO << " - Not Valid";

diff --git a/src/filemanager.cpp b/src/filemanager.cpp
@@ -4071,9 +4071,9 @@ void FileManager::writeQuery(QSqlQuery query, QTextStream &out, const ExportMode
     if (nameCol>=0)
     {
         aux = (query.value(nameCol)).toString();
-        qDebug() << Q_FUNC_INFO << ":  FREQ_TX-1: "  << aux;
+        //qDebug() << Q_FUNC_INFO << ":  FREQ_TX-1: "  << aux;
         aux = util->checkAndFixASCIIinADIF(aux);
-        qDebug() << Q_FUNC_INFO << ":  FREQ_TX-2: "  << aux;
+        //qDebug() << Q_FUNC_INFO << ":  FREQ_TX-2: "  << aux;
         double freqTX = aux.toDouble();
         qso.setFreq(freqTX);
     }

diff --git a/src/qso.cpp b/src/qso.cpp
@@ -361,7 +361,7 @@ bool QSO::setCall(const QString &_c)
 
 QString QSO::getCall()
 {
-    qDebug() << Q_FUNC_INFO << ": " << callsign;
+    //qDebug() << Q_FUNC_INFO << ": " << callsign;
     return callsign;
 }
 
@@ -2613,8 +2613,8 @@ bool QSO::setQSLRDate(const QString& data) { return setQSLRDate(util->getDateFro
 bool QSO::setQSLSDate(const QString& data) { return setQSLSDate(util->getDateFromADIFDateString(data)); }
 bool QSO::setDate(const QString& data) { return setDate(util->getDateFromADIFDateString(data)); }
 bool QSO::setDateOff(const QString& data) { return setDateOff(util->getDateFromADIFDateString(data)); }
-bool QSO::setQSORandom(const QString& data) { qDebug() << "XXX: " << data; return setQSORandom(util->QStringToBool(data)); }
-bool QSO::setSilentKey(const QString& data) {  qDebug() << "XXY: " << data; return setSilentKey(util->QStringToBool(data)); }
+bool QSO::setQSORandom(const QString& data) {  return setQSORandom(util->QStringToBool(data)); }
+bool QSO::setSilentKey(const QString& data) { return setSilentKey(util->QStringToBool(data)); }
 bool QSO::setSwl(const QString& data) { return setSwl(util->QStringToBool(data)); }
 bool QSO::setTimeOff(const QString& data) { return setTimeOff(util->getTimeFromADIFTimeString(data)); }
 bool QSO::setTimeOn(const QString& data) { return setTimeOn(util->getTimeFromADIFTimeString(data)); }
@@ -3076,7 +3076,7 @@ QSqlQuery QSO::getPreparedQuery(const QString &_s)
     query.bindValue(":eqsl_qsl_sent", getEQSLQSL_SENT());
     query.bindValue(":fists", getFists ());
     query.bindValue(":fists_cc", getFistsCC ());
-    qDebug() << Q_FUNC_INFO << " - 1";
+
     query.bindValue(":force_init", util->boolToCharToSQLite (getForceInit()));
     query.bindValue(":freq_tx", getFreqTX());
     query.bindValue(":freq_rx", getFreqRX());
@@ -3145,7 +3145,6 @@ QSqlQuery QSO::getPreparedQuery(const QString &_s)
     query.bindValue(":qsl_sent_via", getQSLSentVia());
     query.bindValue(":qsl_via", getQSLVia());
     query.bindValue(":qso_complete", getQSOComplete());
-    qDebug() << Q_FUNC_INFO << " - 2";
     query.bindValue(":qso_random", util->boolToCharToSQLite (getQSORandom()));
     query.bindValue(":qth", getQTH());
     query.bindValue(":region", getRegion ());
@@ -3157,7 +3156,6 @@ QSqlQuery QSO::getPreparedQuery(const QString &_s)
     query.bindValue(":sfi", getSFI());
     query.bindValue(":sig", getSig());
     query.bindValue(":sig_info", getSigInfo ());
-    qDebug() << Q_FUNC_INFO << " - 3";
     query.bindValue(":silent_key", util->boolToCharToSQLite (getSilentKey ()));
     query.bindValue(":skcc", getSkcc ());
 
@@ -3171,7 +3169,6 @@ QSqlQuery QSO::getPreparedQuery(const QString &_s)
     query.bindValue(":station_callsign", getStationCallsign());
     //query.bindValue(":submode", getModeIdFromModeName (true));
 
-    qDebug() << Q_FUNC_INFO << " - 4";
     query.bindValue(":swl", util->boolToCharToSQLite (getSwl()));
     query.bindValue(":uksmg", getUksmg ());
     query.bindValue(":usaca_counties", getUsacaCounties ());

diff --git a/src/utilities.cpp b/src/utilities.cpp
@@ -317,33 +317,25 @@ bool Utilities::trueOrFalse(const QString &_s)
 QChar Utilities::boolToCharToSQLite(const bool _b)
 {
     if (_b)
-    {
-        qDebug() << Q_FUNC_INFO << ": Y";
         return 'Y';
-    }
-    else
-    {
-        qDebug() << Q_FUNC_INFO << ": N";
-        return 'N';
-    }
+    return 'N';
 }
 
+
 QString Utilities::boolToQString(const bool _b)
 {
     if (_b)
-    {
         return "True";
-    }
-    else
-    {
-        return "False";
-    }
+    return "False";
 }
 
 bool Utilities::QStringToBool(const QString &_s)
 {
-    qDebug() << Q_FUNC_INFO << ": " << _s;
-    return ((_s.toUpper()) == "Y");
+   //qDebug() << Q_FUNC_INFO << ": " << _s;
+    if (_s.toUpper() == "Y")
+        return true;
+    return false;
+    //return ((_s.toUpper()) == "Y");
 }
 
 QString Utilities::checkAndFixASCIIinADIF(const QString &_data)