Dic refactoring

Author: glorieux-f

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/FrenchAnalyzer.java

@@ -88,7 +88,7 @@ public FrenchAnalyzer() throws IOException
     {
         super(PER_FIELD_REUSE_STRATEGY);
         stopwords = new CharArraySet(500, false);
-        normalizer = FrenchLexicons.buildWordNormalizer();
+        normalizer = FrenchLexicons.buildNormalizer();
         LexiconHelper.loadSet(stopwords, getClass(), "/com/github/oeuvres/alix/fr/stop.csv");
         lemmaLexicon = FrenchLexicons.buildLemmaLexicon();
 

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/FrenchLexicons.java

@@ -49,20 +49,22 @@ private FrenchLexicons()
     {
     }
 
-    public static CharArraySet buildBrevidot() throws IOException
+    public static CharArraySet buildBrevidot()
     {
         // set ignore case
         CharArraySet map = new CharArraySet(100, true);
         LexiconHelper.loadSet(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/brevidot.csv", 0, LexiconHelper.CsvHeader.SKIP, ".");
         return map;
     }
 
-    public static CharArrayMap<char[]> buildWordNormalizer()
+    public static CharArrayMap<char[]> buildNormalizer()
     {
         CharArrayMap<char[]> map = new CharArrayMap<char[]>(2000, false);
-        LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm.csv", LexiconHelper.OnDuplicate.REPLACE);
         LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm-1990-classical.csv", LexiconHelper.OnDuplicate.REPLACE);
         LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm-aeoe.csv", LexiconHelper.OnDuplicate.REPLACE);
+        LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm-maj-noacc.csv", LexiconHelper.OnDuplicate.REPLACE);
+        LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm-names.csv", LexiconHelper.OnDuplicate.REPLACE);
+        LexiconHelper.loadMap(map, LexiconHelper.class, "/com/github/oeuvres/alix/fr/norm-misc.csv", LexiconHelper.OnDuplicate.REPLACE);
         return map;
     }