Changeset 2008

Timestamp:

07/05/12 09:34:39 (12 years ago)

Author:

herste

Message:

trying to solve ticket 76

Location:

vlo/trunk/vlo_webapp/src/main

Files:

• bin/vlo_solr_importer.sh (modified) (1 diff)
• java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) (4 diffs)

vlo/trunk/vlo_webapp/src/main/bin/vlo_solr_importer.sh

@@ -12 +12 @@
 
 
-$JAVA -Xmx1024M -cp .:vlo-2.7-jar.jar eu.clarin.cmdi.vlo.importer.MetadataImporter
+$JAVA -Xmx1024M -cp .:vlo-2.9-jar.jar eu.clarin.cmdi.vlo.importer.MetadataImporter

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

@@ -32 +32 @@
     private Map<String, String> silToIso639Map;
     private Map<String, String> languageNameToIso639Map;
-    private Map<String, String> iso639ToLanguageNameMap;   
+    private Map<String, String> iso639ToLanguageNameMap;
 
     /**
@@ -74 +74 @@
             }
         }
+        // Convert to lowercase to capture erroneously capitalized language codes in the CMDI files.
+        // NOTE: In the mappings themselves we do not capitalize.
+        result = result.toLowerCase();
         return result;
     }
-    
+
     public String getLanguageNameForLanguageCode(String langCode) {
         String result = getIso639ToLanguageNameMap().get(langCode);
-        
+
         if(result == null)
                 result = langCode;
-        
+
         return result;
     }
@@ -106 +109 @@
         return threeLetterCodesMap;
     }
-    
+
     protected Map<String, String> getLanguageNameToIso639Map() {
         if (languageNameToIso639Map == null) {
-                        languageNameToIso639Map = createReverseCodeMap(Configuration.getInstance().getLanguage3LetterCodeComponentUrl()); 
+                        languageNameToIso639Map = createReverseCodeMap(Configuration.getInstance().getLanguage3LetterCodeComponentUrl());
         }
         return languageNameToIso639Map;
     }
-    
+
     private Map<String, String> getIso639ToLanguageNameMap() {
         if (iso639ToLanguageNameMap == null) {
                 iso639ToLanguageNameMap = createCodeMap(Configuration.getInstance().getLanguage3LetterCodeComponentUrl());
         }
-        
+
         return iso639ToLanguageNameMap;
     }
-    
+
     private Map<String, String> createCodeMap(String url) {
         LOG.debug("Creating language code map.");
@@ -131 +134 @@
         }
     }
-    
+
     private Map<String, String> createReverseCodeMap(String url) {
         LOG.debug("Creating language code map.");