excludeBrackets

DOREMUS-ANR · Jan 27, 2020 · c13f066 · c13f066
1 parent d60ef6a
commit c13f066
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'org.doremus'
-version '0.5'
+version '0.5.1'
 
 apply plugin: 'java'
 apply plugin: 'application'

diff --git a/src/main/java/org/doremus/string2vocabulary/VocabularyManager.java b/src/main/java/org/doremus/string2vocabulary/VocabularyManager.java
@@ -191,6 +191,16 @@ public static Resource searchInCategory(String label, String lang, List<Vocabula
       concept = v.findConcept(label, false);
       if (concept != null) return concept;
     }
+    // third check: exclude brackets
+    for (Vocabulary v : category) {
+      concept = v.findConcept(langLabel, true, true);
+      if (concept != null) return concept;
+    }
+    // fourth check: exclude brackets + not caring about the language
+    for (Vocabulary v : category) {
+      concept = v.findConcept(langLabel, false, true);
+      if (concept != null) return concept;
+    }
 
     // workaround: mi bemol => mi bemol majeur
     if ("key".equals(category) && !label.endsWith("majeur")) {