Merge branch 'mid-may' into 'master'

Fix for QSO unique hash

See merge request gridtracker.org/gridtracker!314

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!

debian/changelog

@@ -1,5 +1,10 @@
+
+gridtracker (1.24.0512) unstable; urgency=low
+  - System: Fixed bug in QSO unique hash algorithm
+  -- Tag Loomis <n0ttl@gridtracker.org>  Sun, 12 May 2024 00:00:00 -0000
+
 gridtracker (1.24.0504) unstable; urgency=low
-  - System: BIGCTY Update from April 30th (3D2CCC etc)
+  - System: BIGCTY Update from April 29th (3D2CCC etc)
   - Logging: Threaded log loading and parsing > 500,000 QSOs now supported in real-time
   - Logging: Manual log loads automatically added to startup
   - System: US database refactor

gridtracker.spec

@@ -1,6 +1,6 @@
 Name:           {{{ git_name name=gridtracker }}}
 Summary:        GridTracker: An Amateur Radio Companion
-Version:        1.24.0504
+Version:        1.24.0512
 Release:        1%{?dist}
 BuildArch:      noarch
 Source0:        {{{ git_dir_pack }}}
@@ -40,8 +40,10 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Sun May 12 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0512-1
+ - System: Fixed bug in QSO unique hash algorithm 
 * Sat May 04 2024 Tag Loomis <n0ttl@gridtracker.org> - 1.24.0504-1
- - System: BIGCTY Update from April 30th (3D2CCC etc)
+ - System: BIGCTY Update from April 29th (3D2CCC etc)
  - Logging: Threaded log loading and parsing > 500,000 QSOs now supported in real-time
  - Logging: Manual log loads automatically added to startup
  - System: US database refactor

package.nw/lib/adifWorker.js

@@ -427,8 +427,8 @@ function addQSO(
 
   let details = null;
   let timeMod = finalTime - ((finalTime % 60) + 30);
-  hash = unique(mode + band + finalDXcall + timeMod);
+  hash = unique(finalDXcall + timeMod) + unique(mode + band);
-
+  
   if (hash in GT.QSOhash)
   {
     details = GT.QSOhash[hash];

package.nw/lib/gtCommon.js

@@ -550,7 +550,7 @@ function binaryTransfer(integer, binary) {
 	var stack = [];
 	var num;
 	var result = '';
-	var sign = integer < 0 ? '-' : '';
+	var sign = integer < 0 ? 'Z' : '';
 
 	function table (num) {
 		var t = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -580,6 +580,5 @@ function binaryTransfer(integer, binary) {
  * eg: -aGtzd will be ZaGtzd
  */
 function unique (text) {
-	var id = binaryTransfer(bitwise(text), 61);
+	return binaryTransfer(bitwise(text), 62);
-	return id.replace('-', 'Z');
 }

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.24.0504",
+  "version": "1.24.0512",
   "betaVersion": "",
   "description": "GridTracker: An Amateur Radio Companion",
   "author": "GridTracker.org",