diff --git a/package.nw/gt_update.html b/package.nw/gt_update.html
index 098100a..b612fa6 100644
--- a/package.nw/gt_update.html
+++ b/package.nw/gt_update.html
@@ -28,7 +28,7 @@ Fixes:
US Callsign Database:
truncation of incomplete loads due to program restart, revisted
- 630m band properly recognized and added to "Band Activity Graph"
+ 630m band properly recognized and added to "Band Activity Graph"
Update:
"All Grid Overlay" hotkey "B" has a new panel button
diff --git a/package.nw/lib/callsigns.js b/package.nw/lib/callsigns.js
index e388e03..bdfa1c5 100644
--- a/package.nw/lib/callsigns.js
+++ b/package.nw/lib/callsigns.js
@@ -620,13 +620,14 @@ function processulsCallsigns(data, flag, cookies, starting, finished)
g_callsignLookups.ulsLastUpdate = 0;
saveCallsignSettings();
ulsUpdatedTd.innerHTML = "Processing...";
+ tx.executeSql('DROP TABLE calls');
tx.executeSql('CREATE TABLE IF NOT EXISTS calls (callsign TEXT PRIMARY KEY, zip, state)');
}
for (var x in lines )
{
if ( lines[x].length )
{
- tx.executeSql( 'INSERT OR REPLACE INTO calls (callsign, zip, state) VALUES ("'+lines[x].substr(7)+'","'+lines[x].substr(0,5)+'","'+lines[x].substr(5,2)+'")');
+ tx.executeSql( 'INSERT INTO calls (callsign, zip, state) VALUES ("'+lines[x].substr(7)+'","'+lines[x].substr(0,5)+'","'+lines[x].substr(5,2)+'")');
++g_ulsCallsignsCount;
if ( g_ulsCallsignsCount % 7969 == 0 )
ulsCountTd.innerHTML = g_ulsCallsignsCount;
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index a8b4904..bc20b1c 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -2,7 +2,7 @@
var gtComment1 = "GridTracker is not open source, you may not change, modify or 'borrow' code for your needs that is redistributed in any form without first asking and receiving permission from N0TTL *and* N2VFL";
var gtComment2 = "Third party libraries and functions used are seperated to third-party.js or their respective lib .js files, the GT close-source directive does not apply to these files of course";
var gtVersion = 1200830;
-var gtBeta = "VHS";
+var gtBeta = "BASF";
var g_startVersion = 0;
@@ -1116,13 +1116,14 @@ function addDeDx(finalGrid, finalDXcall, cq, cqdx, locked, finalDEcall, finalRST
details.cqz = g_gridToCQZone[fourGrid][0];
}
if (details.cqz.length > 0) {
- g_tracker.worked.cqz[details.cqz + band + mode] = true;
- g_tracker.worked.cqz[details.cqz] = true;
- g_tracker.worked.cqz[details.cqz + mode] = true;
- g_tracker.worked.cqz[details.cqz + band] = true;
+ var sCQZ = String(details.cqz);
+ g_tracker.worked.cqz[details.sCQZ + band + mode] = true;
+ g_tracker.worked.cqz[details.sCQZ] = true;
+ g_tracker.worked.cqz[details.sCQZ + mode] = true;
+ g_tracker.worked.cqz[details.sCQZ + band] = true;
if (isDigi == true) {
- g_tracker.worked.cqz[details.cqz + "dg"] = true;
- g_tracker.worked.cqz[details.cqz + band + "dg"] = true;
+ g_tracker.worked.cqz[details.sCQZ + "dg"] = true;
+ g_tracker.worked.cqz[details.sCQZ + band + "dg"] = true;
}
}
@@ -11015,14 +11016,7 @@ function loadViewSettings() {
{
lookupMissingGridDiv.style.display = "none";
}
- if ( g_appSettings.lookupOnTx == true )
- {
- lookupCloseLogDiv.style.display = "inline-block";
- }
- else
- {
- lookupCloseLogDiv.style.display = "none";
- }
+
if (g_receptionSettings.viewPaths)
{
@@ -11344,8 +11338,8 @@ function startupEngine()
setTimeout(startupEngine, 10);
} else {
startupStatusDiv.innerHTML = "Completed";
- startupAdifLoadCheck();
setTimeout(endStartup,2000);
+ startupAdifLoadCheck();
}
}
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index fa12cc0..59806ea 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -3980,9 +3980,16 @@ function scoreAcqz(award, obj)
function testAcqz(award, obj, baseHash )
{
- if ( obj.cqz && obj.cqz + baseHash in g_tracker[award.test.look].cqz )
+ if ( obj.cqza )
{
- return false;
+ var x = 0;
+ for ( var z in obj.cqza )
+ {
+ if ( obj.cqza[z] + baseHash in g_tracker[award.test.look].cqz )
+ x++;
+ }
+ if ( obj.cqza.length == x )
+ return false;
}
return true;
}