Changeset 5188

Timestamp:

05/12/14 15:08:42 (10 years ago)

Author:

teckart@informatik.uni-leipzig.de

Message:

Changed content of facet "languageCode". This facet will be renamed to "language" as soon as the current facets "language" and "languages" are not needed anymore. The facet now contains the ISO 639-3 code (with the prefix "code:") or the language name (with the prefix "name:") if the language code could not be identified.

Location:

vlo/trunk/vlo-importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/vlo/importer/LanguageLinkPostProcessor.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/importer/LanguageNamePostProcessor.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessorTest.java (modified) (1 diff)

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java

@@ -23 +23 @@
     private final static Logger LOG = LoggerFactory.getLogger(LanguageCodePostProcessor.class);
 
+    protected static final String CODE_PREFIX = "code:";
+    protected static final String LANG_NAME_PREFIX = "name:";
     protected static final String ISO639_3_PREFIX = "ISO639-3:";
     protected static final String SIL_CODE_PREFIX = "RFC1766:x-sil-";
@@ -51 +53 @@
         String result = value;
         
+        // input is already ISO 639-3?
+        if(getIso639ToLanguageNameMap().keySet().contains(value.toUpperCase()))
+            return CODE_PREFIX + value.toLowerCase();
+        
         // deal with prefixes or language names
         if (value.length() != 2 && value.length() != 3) {
             if (value.startsWith(ISO639_3_PREFIX)) {
-                return value.substring(ISO639_3_PREFIX.length()).toLowerCase();
+                return CODE_PREFIX + value.substring(ISO639_3_PREFIX.length()).toLowerCase();
             } else if (value.startsWith(SIL_CODE_PREFIX) || value.startsWith(SIL_CODE_PREFIX_alt)) {
                 result = value.substring(value.lastIndexOf("-")+1);
@@ -60 +66 @@
                 String isoCode = silToIso639Map.get(result.toLowerCase());
                 if (isoCode != null) {
-                    result = isoCode;
+                    result = CODE_PREFIX + isoCode;
                 }
             } else if(getLanguageNameToIso639Map().containsKey(value)) { // (english) language name?
-                return getLanguageNameToIso639Map().get(value);
+                return CODE_PREFIX + getLanguageNameToIso639Map().get(value);
             }
         }
@@ -71 +77 @@
             if(silToIso639Map == null)
                 silToIso639Map = getSilToIso639Map();
-            result = silToIso639Map.get(result.toLowerCase());
+            result = CODE_PREFIX + silToIso639Map.get(result.toLowerCase());
         }
         
         // convert ISO 639-2/T codes to ISO 639-3
         if (getIso6392TToISO6393Map().containsKey(value.toLowerCase())) {
-            result = getIso6392TToISO6393Map().get(value.toLowerCase());
-        }
-        
+            result = CODE_PREFIX + getIso6392TToISO6393Map().get(value.toLowerCase());
+        }
+        
+        // language code not identified? -> language name
+        if(!result.startsWith(CODE_PREFIX) && !result.equals(""))
+            result = LANG_NAME_PREFIX + result;
         return result;
     }

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageLinkPostProcessor.java

@@ -13 +13 @@
         String result = langCode;
         if (langCode != null) {
-            if(langCode.length() == 3)
+            if(langCode.startsWith(CODE_PREFIX)) {
+                langCode = langCode.substring(CODE_PREFIX.length());
                 result = "<a href=\""+ MetadataImporter.config.getLanguageLinkPrefix() + langCode+"\">"+getLanguageNameForLanguageCode(langCode.toUpperCase())+"</a>";
+            } else if(langCode.startsWith(LANG_NAME_PREFIX)) {
+                result = langCode.substring(LANG_NAME_PREFIX.length());
+            }
         }
         return result;

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageNamePostProcessor.java

@@ -22 +22 @@
         if (value != null) {
             String langCode = extractLanguageCode(value);
+            if(langCode.startsWith(CODE_PREFIX))
+                langCode = langCode.substring(CODE_PREFIX.length());
+            
             if (langCode.length() == 2) {
                 twoLetterCodesMap = getTwoLetterCountryCodeMap();

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessorTest.java

@@ -20 +20 @@
     public void testLanguageCode() {
         PostProcessor processor = new LanguageCodePostProcessor();
-        assertEquals("nld", processor.process("NL"));
-        assertEquals("eng", processor.process("en"));
-        assertEquals("nld", processor.process("nl"));
-        assertEquals("fry", processor.process("fry"));
-        assertEquals("test", processor.process("test"));
+        assertEquals("code:nld", processor.process("NL"));
+        assertEquals("code:eng", processor.process("en"));
+        assertEquals("code:nld", processor.process("nl"));
+        assertEquals("code:fry", processor.process("fry"));
+        assertEquals("name:test", processor.process("test"));
         assertEquals("", processor.process(""));
         assertEquals(null, processor.process(null));
-        assertEquals("fra", processor.process("ISO639-3:fra"));
-        assertEquals("deu", processor.process("RFC1766:x-sil-GER"));
-        assertEquals("RFC1766:sgn-NL", processor.process("RFC1766:sgn-NL"));
-        assertEquals("eus", processor.process("baq"));
-        assertEquals("eng", processor.process("eng"));
-        assertEquals("eng", processor.process("English"));
-        assertEquals("deu", processor.process("German"));
-        assertEquals("esn", processor.process("Salvadoran Sign Language"));
+        assertEquals("code:fra", processor.process("ISO639-3:fra"));
+        assertEquals("code:deu", processor.process("RFC1766:x-sil-GER"));
+        assertEquals("name:RFC1766:sgn-NL", processor.process("RFC1766:sgn-NL"));
+        assertEquals("code:eus", processor.process("baq"));
+        assertEquals("code:eng", processor.process("eng"));
+        assertEquals("code:eng", processor.process("English"));
+        assertEquals("code:deu", processor.process("German"));
+        assertEquals("code:esn", processor.process("Salvadoran Sign Language"));
     }