mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2043 from hugosilvaparagramanet/feature/improve-mark-as-upload-process-for-qo100-dx-club-export 

Mark QSOs as uploaded in batch to improve performance
pull/2028/head
Peter Goodhall 2023-03-21 15:21:58 +00:00 zatwierdzone przez GitHub
rodzic 45f30f04e9 4877b32304
commit d675941d1e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 21 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
application/controllers/Webadif.php
Wyświetl plik

@ -61,7 +61,7 @@ class Webadif extends CI_Controller {
$result = $this->logbook_model->push_qso_to_webadif($webadif_api_url, $webadif_api_key, $adif);
if ($result) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
$this->logbook_model->mark_webadif_qsos_sent([$qso->COL_PRIMARY_KEY]);
$i++;
} else {
$errorMessage = 'QO-100 Dx Club upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
@ -149,8 +149,15 @@ class Webadif extends CI_Controller {
);
if ($data['qsos']!==null) {
$qsoIDs=[];
foreach ($data['qsos']->result() as $qso) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
$qsoIDs[]=$qso->COL_PRIMARY_KEY;
}
$batchSize = 500;
while ($qsoIDs !== []) {
$slice = array_slice($qsoIDs, 0, $batchSize);
$qsoIDs = array_slice($qsoIDs, $batchSize);
$this->logbook_model->mark_webadif_qsos_sent($slice);
}
}

22
application/models/Logbook_model.php
Wyświetl plik

@ -497,7 +497,7 @@ class Logbook_model extends CI_Model {
);
if ($result) {
$this->mark_webadif_qsos_sent($last_id);
$this->mark_webadif_qsos_sent([$last_id]);
}
}
}
@ -632,17 +632,19 @@ class Logbook_model extends CI_Model {
/*
* Function marks QSOs as uploaded to WebADIF.
* $primarykey is the unique id for that QSO in the logbook
* $qsoIDs is an arroy of unique id for the QSOs in the logbook
*/
function mark_webadif_qsos_sent($primarykey)
function mark_webadif_qsos_sent(array $qsoIDs)
{
$data = array(
'upload_date' => date("Y-m-d H:i:s", strtotime("now")),
'qso_id' => $primarykey,
);
$this->db->insert('webadif', $data);
$data = [];
$now = date("Y-m-d H:i:s", strtotime("now"));
foreach ($qsoIDs as $qsoID) {
$data[] = [
'upload_date' => $now,
'qso_id' => $qsoID,
];
}
$this->db->insert_batch('webadif', $data);
return true;
}