Database and other updates

Author: ea4k

src/Changelog

@@ -1,9 +1,11 @@
-WIP: LoTW confirmations are not correctly imported to logbook.dat #798
-TODO: Check DISTANCE on ADIF EXPORT
-CHECK TYPES: Distance should be a double but it is an int or String in some functions
-
+TODO: KLog crashes on Database update:
+qt.sql.qsqlquery: QSqlQuery::prepare: empty query
+ASSERT: "!isEmpty()" in file /usr/include/x86_64-linux-gnu/qt6/QtCore/qlist.h, line 658
 
+WIP: LoTW confirmations are not correctly imported to logbook.dat #798
+TODO: CHECK: HOW QSO_COMPLETE is being read/managed
 -TODO: When downloading from LoTW, if there is no QSOs in the log the message that is shown appears ()
+
 TBD 2025 - 2.4.2
 - Enhancement: Updated some DataBase fields to match ADIF definition better.
 - Enhancement: Sevral refactors & optimization: ADIF import/export

src/adif.cpp

@@ -296,29 +296,29 @@ bool Adif::isValidDXCC(const int _b)
     return ((_b>=0) && (_b<=522));
 }
 
-bool Adif::isValidAge(const int _b)
+bool Adif::isValidAge(const double _b)
 {
-    return ((_b>0) && (_b<=120));
+    return ((_b>0.0) && (_b<=120.0));
 }
 
-bool Adif::isValidAnt_EL(const int _b)
+bool Adif::isValidAnt_EL(const double _b)
 {
-    return ((_b>=-90) && (_b<=900));
+    return ((_b>=-90.0) && (_b<=900.0));
 }
 
-bool Adif::isValidAnt_AZ(const int _b)
+bool Adif::isValidAnt_AZ(const double _b)
 {
-    return ((_b>=0) && (_b<=360));
+    return ((_b>=0.0) && (_b<=360.0));
 }
 
-bool Adif::isValidA_Index(const int _b)
+bool Adif::isValidA_Index(const double _b)
 {
-    return ((_b>=0) && (_b<=400));
+    return ((_b>=0.0) && (_b<=400.0));
 }
 
 bool Adif::isValidDistance(const double _b)
 {
-    return (_b>0);
+    return (_b>0.0);
 }
 
 //bool Adif::isValidAltitude(const double _b)
@@ -386,29 +386,40 @@ bool Adif::isValidQSO_COMPLETE(const QString &_s)
     return ((_s == "Y") || (_s == "N") || (_s == "NIL") || (_s == "?"));
 }
 
+int Adif::setQSO_COMPLETEToDB(const QString &_s)
+{
+    if (_s == "Y")
+        return 1;
+    if (_s == "N")
+        return 2;
+    if (_s == "NIL")
+        return 3;
+    return 4;
+}
+
 QString Adif::getQSO_COMPLETEFromDB(const QString &_s)
 {// Returns the ADIF QSO_COMPLETE
     //1=Y, 2=N, 3=NIL, 4=?
     //qDebug() << Q_FUNC_INFO << ": " << _s;
     int i = _s.toInt();
     switch (i)
     {
-    case 2:
-    {
-        return "N";
-    }
-    case 3:
-    {
-        return "NIL";
-    }
-    case 4:
-    {
-        return "?";
-    }
-    default:
-    {
-        return "Y";
-    }
+        case 2:
+        {
+            return "N";
+        }
+        case 3:
+        {
+            return "NIL";
+        }
+        case 4:
+        {
+            return "?";
+        }
+        default:
+        {
+            return "Y";
+        }
     }
 }
 

src/adif.h

@@ -56,11 +56,11 @@ class Adif : public QObject {
     bool isValidCQz(const int _b);              //1-40
     bool isValidITUz(const int _b);            // 1-90
     bool isValidDXCC(const int _b);            // 0-522
-    bool isValidAge(const int _b);             // 0-120
+    bool isValidAge(const double _b);             // 0-120
     bool isValidDistance(const double _b);        //>0.0
-    bool isValidAnt_EL(const int _b);          //>=0-360
-    bool isValidAnt_AZ(const int _b);          //>=-90-90
-    bool isValidA_Index(const int _b);              //0-400
+    bool isValidAnt_EL(const double _b);          //>=0-360
+    bool isValidAnt_AZ(const double _b);          //>=-90-90
+    bool isValidA_Index(const double _b);              //0-400
     bool isValidIOTA_islandID(const int _b);   //1-99999999
     bool isValidNRBursts(const int _b);        //>0
     bool isValidPings(const int _b);            //>0
@@ -75,7 +75,9 @@ class Adif : public QObject {
     bool isValidAntPath(const QString &_s);
     bool isValidMode (const QString &_s);
     bool isValidQSO_COMPLETE(const QString &_s);        // "Y", "N", "NIL", "?"
-    QString getQSO_COMPLETEFromDB(const QString &_s);    // Translates the DB value into an ADIF value
+    QString getQSO_COMPLETEFromDB(const QString &_s);   // Translates the DB value into an ADIF value
+    int setQSO_COMPLETEToDB(const QString &_s);         // Translates the ADIF to a DB value
+
     bool isValidPOTA(const QString &_s);            // TODO
     bool isValidWWFF_Ref(const QString &_s);        // TODO
     bool isValidQSLRCVD(const QString &_s, bool _importing=true);         // Y, I, or V) (V on import only)