Primary subdivisions are read on DB update

ea4k · Aug 10, 2024 · 4503525 · 4503525
1 parent fe5017d
commit 4503525
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/database.cpp b/src/database.cpp
@@ -6065,6 +6065,8 @@ bool DataBase::updateTo026()
     //qDebug() << Q_FUNC_INFO << " - 40" ;
     if (!updateTableLog(7))
         return false;
+    if (!recreateTablePrimarySubdivisions())
+        return false;
     //qDebug() << Q_FUNC_INFO << " - 50" ;
     return updateDBVersion(softVersion, "0.026");
 }

diff --git a/src/database/db_adif_primary_subdvisions_data.cpp b/src/database/db_adif_primary_subdvisions_data.cpp
@@ -84,7 +84,7 @@ bool DB_ADIF_Primary_Subdvisions_data::addValues(const QString &rows, const QStr
 
     foreach (aux, values)
     {
-        oneValue = QString("%1 (%2)").arg(sq).arg(aux);
+        oneValue = QString("%1 (%2)").arg(sq, aux);
         if (!exe.execQuery(Q_FUNC_INFO, oneValue))
             return false;
     }
@@ -228,7 +228,7 @@ bool DB_ADIF_Primary_Subdvisions_data::add_CT_272()
         << "'272', 'Viana do Castelo', 'VC', 'CT', '14', '37', '', '-1', '', '', 'N'"
         << "'272', 'Vila Real', 'VR', 'CT', '14', '37', '', '-1', '', '', 'N'"
         << "'272', 'Viseu', 'VS', 'CT', '14', '37', '', '-1', '', '', 'N'"
-           ;
+        ;
 
     return addValues(rows, values);
 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -2075,7 +2075,7 @@ void MainWindow::slotQRZTextChanged(QString _qrz)
     cleanQRZCOMreceivedDataFromUI();
      //qDebug()<< Q_FUNC_INFO << ": currentQRZ: " <<_qrz ;
 
-    QString pref = util->getPrefixFromCall(_qrz);
+    //QString pref = util->getPrefixFromCall(_qrz);
     //logEvent(Q_FUNC_INFO, QString("Call/Prefix: %1/%2").arg(_qrz).arg(pref), Devel);
     //currentEntity = world->getQRZARRLId(pref);
     //validar por que no puedo tirar o usar  el prefijo directamente

diff --git a/src/utilities.cpp b/src/utilities.cpp
@@ -843,7 +843,7 @@ void Utilities::setSpecialCalls (const QStringList &_p)
 bool Utilities::isAKnownPrefix(const QString &_c)
 {// TODO: Complete with https://rsgb.org/main/operating/licensing-novs-visitors/international-prefixes/
     qDebug() << Q_FUNC_INFO << ": " << _c;
-    QString aux;
+   // QString aux;
     if (_c.isNull() )
     {
         qDebug() << Q_FUNC_INFO << ": END - 1";
@@ -860,7 +860,7 @@ bool Utilities::isAKnownPrefix(const QString &_c)
 bool Utilities::isAKnownCall(const QString &_c)
 {
     //qDebug() << Q_FUNC_INFO << ": " << _c;
-    QString aux;
+    //QString aux;
     if (_c.isNull() )
     {
         //qDebug() << Q_FUNC_INFO << ": END - 1";