X-Git-Url: https://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FConfig.java;h=46e75f68715ab58ffcb59026f898364ad6448df8;hp=fec3770a6c0a25459afb0910af389b4ff73aa624;hb=9ff314621235d6b748abb128edf0331480d0eaaf;hpb=e93f5e690bea424f7b4aec8640c865ca92006db8

diff --git a/war/src/main/java/pnews/servlet/Config.java b/war/src/main/java/pnews/servlet/Config.java
index fec3770..46e75f6 100644
--- a/war/src/main/java/pnews/servlet/Config.java
+++ b/war/src/main/java/pnews/servlet/Config.java
@@ -28,6 +28,7 @@ public class Config {
         private Category[] categories;
         private Language[] languages;
         private final Set<String> blacklistedEntities = new HashSet<>();
+        private final HashMap<String, String> entityAliases = new HashMap<>();
         private static final String CLASS_NAME = Config.class.getName();
         
         /**
@@ -83,13 +84,13 @@ public class Config {
         }
         
         private void loadEntities(JsonObject jroot) {
-                JsonObject jentities;
+                JsonObject jentities, jaliases;
                 JsonArray jblacklist;
                 final String METHOD_NAME = "loadEntities";
                 
                 jentities = jroot.getJsonObject("entities");
-                jblacklist = jentities.getJsonArray("blacklist");
                 
+                jblacklist = jentities.getJsonArray("blacklist");                
                 jblacklist.forEach((jv)-> {
                         JsonString js;
                         
@@ -97,7 +98,28 @@ public class Config {
                         blacklistedEntities.add(js.getString());
                 });
                 
+                jaliases = jentities.getJsonObject("aliases");
+                jaliases.forEach((k, v)-> {
+                        JsonArray jsources = (JsonArray)v;
+                        
+                        jsources.forEach((jsource)-> {
+                                entityAliases.put(((JsonString)jsource).getString(), k);
+                        });
+                });
+                
                 LOG.logp(Level.FINEST, CLASS_NAME, METHOD_NAME, " blacklistedEntities=" + blacklistedEntities);
+                LOG.logp(Level.FINEST, CLASS_NAME, METHOD_NAME, " entityAliases=" + entityAliases);
+        }
+        
+        public String getEntityAlias(String entity) {
+                String result;
+                
+                result = entityAliases.get(entity);
+                
+                if (result == null)
+                        return entity;
+                else
+                        return result;
         }
         
         public void loadConfig() throws UnsupportedEncodingException {