Fix 2-character prefix search (#415)

Tlf · Nov 4, 2023 · e6e0c48 · e6e0c48
1 parent 3e60a4e
commit e6e0c48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/dxcc.c b/src/dxcc.c
@@ -146,8 +146,16 @@ int find_best_match(const char *call) {
     /* first check if it has a unique 2-char prefix */
     if (strlen(call) >= 2) {
 	int key = prefix_hash_key(call);
-	if (two_char_prefix_index[key] >= 0) {
-	    return two_char_prefix_index[key];
+	w = two_char_prefix_index[key];
+	if (w >= 0) {
+	    bool ok = true;
+	    // for an exact entry require the whole call to match
+	    if (prefix_by_index(w)->exact) {
+		ok = (strcmp(prefix_by_index(w)->pfx, call) == 0);
+	    }
+	    if (ok) {
+		return w;
+	    }
 	}
     }
 

diff --git a/test/test_getctydata.c b/test/test_getctydata.c
@@ -144,6 +144,7 @@ void test_best_match(void **state) {
     assert_string_equal(best_prefix("EA8XYZ"), "EA8");
     assert_string_equal(best_prefix("W3A"), "W");
     assert_string_equal(best_prefix("KL7ND"), "KL");
+    assert_string_equal(best_prefix("G8AAA"), "G");
 }
 
 void test_location_known(void **state) {