Changeset 6715 for vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

Timestamp:

10/30/15 17:19:52 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

cross-mapping
vocabulary-entry instead of invertedMap

File:

• vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) (7 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.importer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.ximpleware.AutoPilot;
@@ -8 +26 @@
 import com.ximpleware.XPathEvalException;
 import com.ximpleware.XPathParseException;
+
 import eu.clarin.cmdi.vlo.FacetConstants;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class CMDIParserVTDXML implements CMDIDataProcessor {
@@ -231 +238 @@
      */
     private void processFacets(CMDIData cmdiData, VTDNav nav, FacetMapping facetMapping) throws VTDException {
-        List<FacetConfiguration> facetList = facetMapping.getFacets();
+                
+        List<FacetConfiguration> facetList = facetMapping.getFacets();          
         for (FacetConfiguration config : facetList) {
             boolean matchedPattern = false;
@@ -289 +297 @@
                 continue;
             }
-
+            
             final List<String> values = postProcess(config.getName(), value);
-            insertFacetValues(config.getName(), values, cmdiData, languageCode, allowMultipleValues, config.isCaseInsensitive());
+            
+            insertFacetValues(config.getName(), values, cmdiData, languageCode, allowMultipleValues, config.isCaseInsensitive(), true);
+            
+            crossMap(config, value, cmdiData, languageCode);
             
             //add also non curated resource type
@@ -304 +315 @@
                     derivedValues.addAll(postProcess(derivedFacet, postProcessedValue));
                 }
-                insertFacetValues(derivedFacet, derivedValues, cmdiData, languageCode, allowMultipleValues, config.isCaseInsensitive());
+                insertFacetValues(derivedFacet, derivedValues, cmdiData, languageCode, allowMultipleValues, config.isCaseInsensitive(), true);
             }
 
@@ -330 +341 @@
     }
 
-    private void insertFacetValues(String name, List<String> valueList, CMDIData cmdiData, String languageCode, boolean allowMultipleValues, boolean caseInsensitive) {
+    
+    /*
+         * Add values to facet either they come from MD fields either from cross mapping
+         * Advantage is given to the values from MD fields. They will be always at the begging of the list and in case
+         * when facet doesn't allow multiple values and we already had value from cross mapping this value will be overridden
+         * 
+         */
+    private void insertFacetValues(String name, List<String> valueList, CMDIData cmdiData, String languageCode, boolean allowMultipleValues, boolean caseInsensitive, boolean comesFromConceptMapping) {
+        
+        //keep only values from original concepts, not from cross mappings
+                if(comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument().containsKey(name)){
+                        cmdiData.getSolrDocument().remove(name);
+                }
+                
+                if(!comesFromConceptMapping && !allowMultipleValues && cmdiData.getSolrDocument().containsKey(name))
+                        return;
+        
         for (int i = 0; i < valueList.size(); i++) {
             if (!allowMultipleValues && i > 0) {
@@ -361 +388 @@
         return resultList;
     }
+    
+    private void crossMap(FacetConfiguration config, String extractedValue, CMDIData cmdiData, String languageCode){
+        
+        if (postProcessors.containsKey(config.getName())){
+            PostProcessor processor = postProcessors.get(config.getName());
+            if(processor instanceof PostProcessorsWithVocabularyMap){
+                
+                List<String> facetNames = MetadataImporter.config.getAllFacetFields();
+                
+                Map<String, String> crossMap = ((PostProcessorsWithVocabularyMap) processor).getCrossMappings(extractedValue);
+                for(Entry e: crossMap.entrySet()){
+                        String toFacet = (String) e.getKey();
+                        String value = (String) e.getValue();
+                        for(String facetName: facetNames){
+                                if(toFacet.toLowerCase().equals(facetName.toLowerCase())){//normalize facet name, map can contain it in any case
+                                        insertFacetValues(facetName, Arrays.asList(value), cmdiData, languageCode, config.getAllowMultipleValues(), config.isCaseInsensitive(), false);
+                                }
+                        }
+                }
+            }
+        }
+    }
+    
 }