From 30bc3f9281962455b373eb254db6bced5f166039 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Mon, 11 Dec 2023 13:59:23 +0100 Subject: [PATCH] (converter) Use the prefix ip: instead of geopip: for country codes This is the same as the prefix for the IP address, but I don't think that substantially matters, the as two have such different namespaces there can be no confusion. --- .../marginalia/converting/processor/DomainProcessor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java b/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java index df682d77..fc824906 100644 --- a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java +++ b/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java @@ -49,12 +49,11 @@ public class DomainProcessor { this.anchorTagsSource = anchorTagsSourceFactory.create(); this.geoIpDictionary = geoIpDictionary; + geoIpDictionary.waitReady(); } @SneakyThrows public ProcessedDomain process(SerializableCrawlDataStream dataStream) { - geoIpDictionary.waitReady(); - var ret = new ProcessedDomain(); List docs = new ArrayList<>(); @@ -116,9 +115,9 @@ public class DomainProcessor { terms.add("ip:"+ip); - String geoIp = geoIpDictionary.getCountry(ip); - if (!geoIp.isBlank()) { - terms.add("geoip:"+geoIp.toLowerCase()); + String ipCountryCode = geoIpDictionary.getCountry(ip).toLowerCase(); + if (!ipCountryCode.isBlank()) { + terms.add("ip:"+ipCountryCode); } if (cookies) {