Merge pull request #629 from ea5wa/master

Closes #627, #618 and #615
ea4k · Oct 19, 2023 · e6f2f14 · e6f2f14
2 parents d6880ee + ad8f78e
commit e6f2f14
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 249 deletions.
diff --git a/src/README-DEVEL b/src/README-DEVEL
@@ -142,7 +142,6 @@ Header fields:
 
 QSO fields:
     APP_KLOG_POINTS: Points given by the QSO.
-    APP_KLOG_MULTIPLIER: Information about the multiplier status of the QSO.
     APP_KLOG_LOGN: Lognumber if the ADIF file contains several logs.
 
 

diff --git a/src/database.cpp b/src/database.cpp
@@ -496,7 +496,6 @@ bool DataBase::createTableLog(bool temp)
              "freq VARCHAR, "
              "freq_rx VARCHAR, "
              "gridsquare VARCHAR, "
-             "guest_op VARCHAR,"
              "hrdlog_qso_upload_date DATETIME, "
              "hrdlog_qso_upload_status  VARCHAR(1), "
              "iota VARCHAR(6), "
@@ -509,7 +508,6 @@ bool DataBase::createTableLog(bool temp)
              "lotw_qsl_rcvd VARCHAR(1), "
              "lotw_qsl_sent VARCHAR(1), "
              "max_bursts INTEGER, "
-             "multiplier INTEGER,"
              "ms_shower VARCHAR, "
              "my_antenna VARCHAR,"
              "my_city VARCHAR, "
@@ -541,7 +539,6 @@ bool DataBase::createTableLog(bool temp)
              "operator VARCHAR, "
              "owner_callsign VARCHAR, "
              "pfx VARCHAR, "
-             "points INTEGER,"
              "precedence VARCHAR, "
              "prop_mode VARCHAR, "
              "public_key VARCHAR, "
@@ -585,7 +582,6 @@ bool DataBase::createTableLog(bool temp)
              "tx_pwr REAL, "
              "web VARCHAR, "
              "qso_date_off DATETIME, " //2020-01-01
-             "transmiterid VARCHAR, "
              "marked VARCHAR(1), "
              "lognumber INTEGER NOT NULL, "
 
@@ -3517,7 +3513,7 @@ bool DataBase::updateTableLog(const int _v)
     {
     case 6:     // If 6, we copy in logtemp the full data coming from the old log. This way, the structure of
                 // the log table is updated without any data loss.
-        queryString = QString ("INSERT INTO logtemp (qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, points, multiplier, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, transmiterid, marked, lognumber) SELECT qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, points, multiplier, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, transmiterid, marked, lognumber FROM log");
+        queryString = QString ("INSERT INTO logtemp (qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, marked, lognumber) SELECT qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, marked, lognumber FROM log");
     break;
     default:
             //qDebug() << "DataBase::updateTableLog FALSE END" ;

diff --git a/src/dataproxy_sqlite.cpp b/src/dataproxy_sqlite.cpp
@@ -8710,34 +8710,6 @@ QString DataProxy_SQLite::getADIFQSO(const int _qsoId)
             ADIFqso.append("<CONTEST_ID:" + QString::number(aux.length()) + ">" + aux  + " ");
         }
     }
-    nameCol = rec.indexOf("points");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            ADIFqso.append("<APP_KLOG_POINTS:" + QString::number(aux.length()) + ">" + aux  + " ");
-        }
-    }
-    nameCol = rec.indexOf("multiplier");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            ADIFqso.append("<APP_KLOG_MULTIPLIER:" + QString::number(aux.length()) + ">" + aux  + " ");
-        }
-        //qDebug() << "DataProxy_SQLite::getADIFQSO - 40";
-    }
-    nameCol = rec.indexOf("transmiterid");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            ADIFqso.append("<APP_KLOG_TRX:" + QString::number(aux.length()) + ">" + aux  + " ");
-        }
-    }
     nameCol = rec.indexOf("country");
     if (nameCol>=0)
     {
@@ -8872,15 +8844,6 @@ QString DataProxy_SQLite::getADIFQSO(const int _qsoId)
             ADIFqso.append("<FORCE_INIT:" + QString::number(aux.length()) + ">" + aux  + " ");
         }
     }
-    nameCol = rec.indexOf("guest_op");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            ADIFqso.append("<GUEST_OP:" + QString::number(aux.length()) + ">" + aux  + " ");
-        }
-    }
     nameCol = rec.indexOf("hrdlog_qso_upload_date");
     if (nameCol>=0)
     {

diff --git a/src/filemanager.cpp b/src/filemanager.cpp
@@ -1877,7 +1877,7 @@ bool FileManager::adifReadLog(const QString& tfileName, const int logN)
     // START reading QSO data...
       //qDebug() << Q_FUNC_INFO << " QSO data reading started..." ;
 
-    preparedQuery.prepare( "INSERT INTO log (call, qso_date, bandid, modeid, srx, stx, srx_string, stx_string, qso_date_off, band_rx, rst_sent, rst_rcvd, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, eq_call, email, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, my_gridsquare, iota, iota_island_id, my_iota, my_iota_island_id, k_index, lat, lon, my_lat, my_lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, clublog_qso_upload_date, clublog_qso_upload_status, max_bursts, ms_shower, my_antenna, my_city, my_cnty, my_country, my_cq_zone, my_name, name, operator, station_callsign, owner_callsign, my_rig, my_sig, my_sig_info, my_sota_ref, my_state, state, my_street, my_vucc_grids, notes, nr_bursts, nr_pings, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, tx_pwr, sat_mode, sat_name, sfi, sig, sota_ref, swl, ten_ten, vucc_grids, web, points, multiplier, lognumber) VALUES (:call, :qso_date, :bandid, :modeid, :srx, :stx, :srx_string, :stx_string, :qso_date_off, :band_rx, :rst_sent, :rst_rcvd, :cqz, :ituz, :dxcc, :address, :age, :cnty, :comment, :a_index, :ant_az, :ant_el, :ant_path, :arrl_sect, :checkcontest, :class, :contacted_op, :contest_id, :country, :credit_submitted, :credit_granted, :distance, :eq_call, :email, :eqsl_qslrdate, :eqsl_qslsdate, :eqsl_qsl_rcvd, :eqsl_qsl_sent, :force_init, :freq, :freq_rx, :gridsquare, :my_gridsquare, :iota, :iota_island_id, :my_iota, :my_iota_island_id, :k_index, :lat, :lon, :my_lat, :my_lon, :lotw_qslrdate, :lotw_qslsdate, :lotw_qsl_rcvd, :lotw_qsl_sent, :clublog_qso_upload_date, :clublog_qso_upload_status, :max_bursts, :ms_shower, :my_antenna, :my_city, :my_cnty, :my_country, :my_cq_zone, :my_name, :name, :operator, :station_callsign, :owner_callsign, :my_rig, :my_sig, :my_sig_info, :my_sota_ref, :my_state, :state, :my_street, :my_vucc_grids, :notes, :nr_bursts, :nr_pings, :pfx, :precedence, :prop_mode, :public_key, :qslmsg, :qslrdate, :qslsdate, :qsl_rcvd, :qsl_sent, :qsl_rcvd_via, :qsl_sent_via, :qsl_via, :qso_complete, :qso_random, :qth, :rx_pwr, :tx_pwr, :sat_mode, :sat_name, :sfi, :sig, :sota_ref, :swl, :ten_ten, :vucc_grids, :web, :points, :multiplier, :lognumber)" );
+    preparedQuery.prepare( "INSERT INTO log (call, qso_date, bandid, modeid, srx, stx, srx_string, stx_string, qso_date_off, band_rx, rst_sent, rst_rcvd, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, eq_call, email, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, my_gridsquare, iota, iota_island_id, my_iota, my_iota_island_id, k_index, lat, lon, my_lat, my_lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, clublog_qso_upload_date, clublog_qso_upload_status, max_bursts, ms_shower, my_antenna, my_city, my_cnty, my_country, my_cq_zone, my_name, name, operator, station_callsign, owner_callsign, my_rig, my_sig, my_sig_info, my_sota_ref, my_state, state, my_street, my_vucc_grids, notes, nr_bursts, nr_pings, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, tx_pwr, sat_mode, sat_name, sfi, sig, sota_ref, swl, ten_ten, vucc_grids, web, lognumber) VALUES (:call, :qso_date, :bandid, :modeid, :srx, :stx, :srx_string, :stx_string, :qso_date_off, :band_rx, :rst_sent, :rst_rcvd, :cqz, :ituz, :dxcc, :address, :age, :cnty, :comment, :a_index, :ant_az, :ant_el, :ant_path, :arrl_sect, :checkcontest, :class, :contacted_op, :contest_id, :country, :credit_submitted, :credit_granted, :distance, :eq_call, :email, :eqsl_qslrdate, :eqsl_qslsdate, :eqsl_qsl_rcvd, :eqsl_qsl_sent, :force_init, :freq, :freq_rx, :gridsquare, :my_gridsquare, :iota, :iota_island_id, :my_iota, :my_iota_island_id, :k_index, :lat, :lon, :my_lat, :my_lon, :lotw_qslrdate, :lotw_qslsdate, :lotw_qsl_rcvd, :lotw_qsl_sent, :clublog_qso_upload_date, :clublog_qso_upload_status, :max_bursts, :ms_shower, :my_antenna, :my_city, :my_cnty, :my_country, :my_cq_zone, :my_name, :name, :operator, :station_callsign, :owner_callsign, :my_rig, :my_sig, :my_sig_info, :my_sota_ref, :my_state, :state, :my_street, :my_vucc_grids, :notes, :nr_bursts, :nr_pings, :pfx, :precedence, :prop_mode, :public_key, :qslmsg, :qslrdate, :qslsdate, :qsl_rcvd, :qsl_sent, :qsl_rcvd_via, :qsl_sent_via, :qsl_via, :qso_complete, :qso_random, :qth, :rx_pwr, :tx_pwr, :sat_mode, :sat_name, :sfi, :sig, :sota_ref, :swl, :ten_ten, :vucc_grids, :web, :lognumber)" );
 /*
     if (db.transaction())
     {
@@ -2260,7 +2260,6 @@ void FileManager::initializeSwitchHash() {
     {"FREQ", 49},
     {"FREQ_RX", 50},
     {"GRIDSQUARE", 51},
-    {"GUEST_OP", 52},
     {"HRDLOG_QSO_UPLOAD_DATE", 53},
     {"HRDLOG_QSO_UPLOAD_STATUS", 54},
     {"MY_GRIDSQUARE", 55},
@@ -2343,8 +2342,6 @@ void FileManager::initializeSwitchHash() {
     {"VE_PROV", 132},
     {"VUCC_GRIDS", 133},
     {"WEB", 134},
-    {"APP_KLOG_POINTS", 135},
-    {"APP_KLOG_MULTIPLIER", 136},
     {"APP_KLOG_TRX", 137},
     {"APP_KLOG_LOGN", 138},
     {"APP_N1MM_POINTS", 139}
@@ -2802,9 +2799,6 @@ bool FileManager::processQsoReadingADIF(const QStringList &_line, const int logN
                     case(51):
                         preparedQuery.bindValue(":gridsquare", data);
                         break;
-                    case(52):
-                        preparedQuery.bindValue(":guest_op", data);
-                        break;
                     case(53):
                         dateT = util->getDateFromADIFDateString(data);
                         if (dateT.isValid())
@@ -3155,15 +3149,6 @@ bool FileManager::processQsoReadingADIF(const QStringList &_line, const int logN
                     case(134):
                         preparedQuery.bindValue(":web", data);
                         break;
-                    case(135): //Importing own ADIF fields
-                        preparedQuery.bindValue(":points", data);
-                        break;
-                    case(136): //Importing own ADIF fields
-                        preparedQuery.bindValue(":multiplier", data);
-                        break;
-                    case(137): //Importing own ADIF fields
-                        preparedQuery.bindValue(":transmiterid", data);
-                        break;
                     case(138): //Lognumber in a multiple-log file
 
                         //TODO: Think about how to import a file with different logs
@@ -4398,34 +4383,6 @@ void FileManager::writeQuery(QSqlQuery query, QTextStream &out, const ExportMode
             out << "<CONTEST_ID:" << QString::number(aux.length()) << ">" << aux  << " ";
         }
     }
-    nameCol = rec.indexOf("points");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            out << "<APP_KLOG_POINTS:" << QString::number(aux.length()) << ">" << aux  << " ";
-        }
-    }
-    nameCol = rec.indexOf("multiplier");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            out << "<APP_KLOG_MULTIPLIER:" << QString::number(aux.length()) << ">" << aux  << " ";
-        }
-        //qDebug() << "FileManager::writeQuery - 40";
-    }
-    nameCol = rec.indexOf("transmiterid");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            out << "<APP_KLOG_TRX:" << QString::number(aux.length()) << ">" << aux  << " ";
-        }
-    }
     nameCol = rec.indexOf("country");
     if (nameCol>=0)
     {
@@ -4560,15 +4517,6 @@ void FileManager::writeQuery(QSqlQuery query, QTextStream &out, const ExportMode
             out << "<FORCE_INIT:" << QString::number(aux.length()) << ">" << aux  << " ";
         }
     }
-    nameCol = rec.indexOf("guest_op");
-    if (nameCol>=0)
-    {
-        aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux);
-        if ((aux.length())>0)
-        {
-            out << "<GUEST_OP:" << QString::number(aux.length()) << ">" << aux  << " ";
-        }
-    }
     nameCol = rec.indexOf("hrdlog_qso_upload_date");
     if (nameCol>=0)
     {

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -3407,7 +3407,7 @@ void MainWindow::slotOpenWiki()
 {
     logEvent(Q_FUNC_INFO, "Start", Debug);
      //qDebug() << Q_FUNC_INFO ;
-    QDesktopServices::openUrl(QUrl("https://wiki.klog.xyz/"));
+    QDesktopServices::openUrl(QUrl("https://github.com/ea4k/klog/wiki/"));
     logEvent(Q_FUNC_INFO, "END", Debug);
 }