ericek111/Nonemm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Open a log N1MM wrote

Browse Source 
Three things stopped it.

A contest is keyed by ContestNR, not by ContestID. ContestID is only the
ContestInstance table's primary key; DXLOG.ContestNR refers to ContestNR, which
is what N1MM's SQLWhereString matches on. The two agree in a fresh log and
drift apart in one that has been used for a while, so we were reading one
contest's header with another contest's contacts. In a real log of 56284
contacts, joining on ContestID disagreed with the contact's own ContestName
52029 times; joining on ContestNR disagreed 109 times.

N1MM names a contest per mode: CQWWCW, CQWWSSB, CQWWRTTY, never plain CQWW.
Our contests now use those names, and N1mmContestNames turns one back into a
contest and a mode when a log is opened. The name carries the mode, so it beats
the ModeCategory column. Plain CQWW still opens, because older versions wrote
it that way.

The log columns were sized by counting characters, which was too narrow for the
headers: those are drawn in the theme's font, not the grid's monospace. The
grid sizes them now, with the character count as a floor so a column of short
values does not collapse.

Bandmap spots now age from when they arrived rather than from the time written
in them. A node with a wrong clock, or one replaying its backlog on connect,
emptied the bandmap as fast as it filled it.

Checked by opening a real 56284-contact N1MM log under Xvfb and reading the
contest and contacts back.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-08-27 16:27:35 +00:00
parent b9f0166777
commit da9884ebf5
17 changed files with 315 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Nonemm.Contests/ContestRegistry.cs
View File

@@ -13,7 +13,7 @@ public sealed class ContestRegistry
new("CQWW", "CQ World Wide DX", [ModeCategory.Cw, ModeCategory.Phone], m => new CqWorldWide(m)),
new("CQWPX", "CQ WPX", [ModeCategory.Cw, ModeCategory.Phone, ModeCategory.Digital], m => new CqWpx(m)),
new("ARRLDX", "ARRL International DX", [ModeCategory.Cw, ModeCategory.Phone], m => new ArrlDx(m)),
new("IARUHF", "IARU HF World Championship", [ModeCategory.Cw, ModeCategory.Phone], _ => new IaruHf()),
new("IARU", "IARU HF World Championship", [ModeCategory.Cw, ModeCategory.Phone], _ => new IaruHf()),
new("SS", "ARRL Sweepstakes", [ModeCategory.Cw, ModeCategory.Phone], m => new Sweepstakes(m)),
new("ARRLRTTY", "ARRL RTTY Roundup", [ModeCategory.Digital], _ => new RttyRoundup()),
new("NAQP", "North American QSO Party", [ModeCategory.Cw, ModeCategory.Phone, ModeCategory.Digital], m => new NorthAmericanQsoParty(m)),
@@ -68,10 +68,33 @@ public sealed class ContestRegistry
public IReadOnlyList<ContestChoice> Choices =>
byName.Values.OrderBy(c => c.DisplayName, StringComparer.Ordinal).ToList();
public Contest Create(string name, ModeCategory mode) =>
byName.TryGetValue(name, out ContestChoice? choice)
? choice.Create(mode)
: throw new KeyNotFoundException($"no contest named '{name}'");
public Contest Create(string name, ModeCategory mode)
{
ContestChoice choice = Find(name, ref mode)
?? throw new KeyNotFoundException($"no contest named '{name}'");
return choice.Create(mode);
}
public bool Has(string name) => byName.ContainsKey(name);
public bool Has(string name)
{
ModeCategory ignored = ModeCategory.Cw;
return Find(name, ref ignored) is not null;
}
/// A name N1MM wrote carries the mode, and that is better than whatever the
/// log's mode column says, so it wins when the name resolves that way.
private ContestChoice? Find(string name, ref ModeCategory mode)
{
if (byName.TryGetValue(name, out ContestChoice? choice))
{
return choice;
}
if (N1mmContestNames.TryResolve(name, out string family, out ModeCategory named)
&& byName.TryGetValue(family, out ContestChoice? resolved))
{
mode = named;
return resolved;
}
return null;
}
}