Changeset 6653 for vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java
- Timestamp:
- 10/07/15 10:51:24 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java
r6387 r6653 29 29 private final static Logger LOG = LoggerFactory.getLogger(CMDIParserVTDXML.class); 30 30 31 private static final String DEFAULT_LANGUAGE = " und";31 private static final String DEFAULT_LANGUAGE = "code:und"; 32 32 33 33 public CMDIParserVTDXML(Map<String, PostProcessor> postProcessors, Boolean useLocalXSDCache) { … … 285 285 286 286 // ignore non-English language names for facet LANGUAGE_CODE 287 if (config.getName().equals(FacetConstants.FIELD_LANGUAGE_CODE) && !languageCode.equals(" en") && !languageCode.equals("eng") && !languageCode.equals("und")) {287 if (config.getName().equals(FacetConstants.FIELD_LANGUAGE_CODE) && !languageCode.equals("code:eng") && !languageCode.equals("code:und")) { 288 288 index = ap.evalXPath(); 289 289 continue; … … 314 314 // extract language code in xml:lang if available 315 315 Integer langAttrIndex = nav.getAttrVal("xml:lang"); 316 String languageCode = DEFAULT_LANGUAGE;316 String languageCode; 317 317 if (langAttrIndex != -1) { 318 318 languageCode = nav.toString(langAttrIndex).trim(); 319 } 320 // replace 2-letter with 3-letter codes 321 if (MetadataImporter.languageCodeUtils.getSilToIso639Map().containsKey(languageCode)) { 322 languageCode = MetadataImporter.languageCodeUtils.getSilToIso639Map().get(languageCode); 323 } 324 return languageCode; 319 } else { 320 return DEFAULT_LANGUAGE; 321 } 322 323 return postProcessors.get(FacetConstants.FIELD_LANGUAGE_CODE).process(languageCode).get(0); 325 324 } 326 325 … … 332 331 String fieldValue = valueList.get(i).trim(); 333 332 if (name.equals(FacetConstants.FIELD_DESCRIPTION)) { 334 fieldValue = "{ lang='" + languageCode + "'}" + fieldValue;333 fieldValue = "{" + languageCode + "}" + fieldValue; 335 334 } 336 335 cmdiData.addDocField(name, fieldValue, caseInsensitive);
Note: See TracChangeset
for help on using the changeset viewer.