eca509ef4f9c — Josef 'Jeff' Sipek v0.24-rc1 a month ago 
xlua: switch NEQP duplicate hashing to use Cabrillo mode

As the comment in code says, it isn't defined by the rules but it would make
sense for that to be the case.  The log checkers have no idea what actual
mode was used.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
patch browse 
1 files changed, 6 insertions(+), 2 deletions(-)

M xlua/scripts/contests/NEQP.lua

M xlua/scripts/contests/NEQP.lua +6 -2
@@ 83,10 83,14 @@ local raw_county_data = {
 local neqp
 
 local function duphash(qso, tx, rx)
+	-- The rules don't actually define what modes are allowed or how
+	-- they are interpreted for duplicate detection.  Since log
+	-- submission uses the Cabrillo format, it seems reasonable to
+	-- assume that duplicates are determined based on the Cabrillo mode.
 	return string.format("%s-%u-%s-%s-%s",
 			     qso.rx.station_call,
 			     qso.tx.band,
-			     qso.tx.mode,
+			     qso.tx.cabrillo_mode,
 			     tx,
 			     rx)
 end

          
@@ 223,7 227,7 @@ local function qexchange(side, ex)
 end
 
 local function qpoints(qso, tx, rx)
-	assert(qso.tx.mode ~= nil)
+	assert(qso.tx.cabrillo_mode ~= nil)
 
 	return mode_points[qso.tx.cabrillo_mode]
 end