Changeset 6729

Timestamp:

11/02/15 15:22:55 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

PostProcessorWithVocabulary? implements NormalizaitonService?

Location:

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

Files:

• CMDIData.java (modified) (3 diffs)
• CMDIParserVTDXML.java (modified) (1 diff)
• MetadataImporter.java (modified) (2 diffs)
• NationalProjectPostProcessor.java (modified) (1 diff)
• PostProcessorsWithVocabularyMap.java (modified) (2 diffs)

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

@@ -42 +42 @@
     
     private String profileId;
-    private String profileName;
     private String originalResourceType;
 
@@ -162 +161 @@
                 return profileId;               
         }
-
-        public String getProfileName() {
-                return profileName;
-        }
-
-        public void setProfileName(String profileName) {
-                this.profileName = profileName;
-        }
         
         public String getOriginalResourceType() {
@@ -179 +170 @@
         }
         
-        
 }

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

@@ -60 +60 @@
             LOG.error("Problems mapping facets for file: {}", file.getAbsolutePath());
         }
-
-        List<String> profileName = (postProcessors.get(FacetConstants.FIELD_CLARIN_PROFILE)).process(profileId);
-        cmdiData.setProfileName(profileName.get(0));
+        
         nav.toElement(VTDNav.ROOT);
         processResources(cmdiData, nav);

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

@@ -89 +89 @@
         POST_PROCESSORS.put(FacetConstants.FIELD_CLARIN_PROFILE, new CMDIComponentProfileNamePostProcessor());
         POST_PROCESSORS.put(FacetConstants.FIELD_RESOURCE_CLASS, new ResourceClassPostProcessor());
-        POST_PROCESSORS.put(FacetConstants.FIELD_PROFILE, new ProfileNamePostProcessor());
     }
 
@@ -435 +434 @@
         
         
-        //Add profileId & profileName & original resource type
-        solrDocument.addField("profileName", cmdiData.getProfileName());
-        solrDocument.addField("profileId", cmdiData.getProfileId());
+        //Add profileId & original resource type
+        solrDocument.addField("_componentProfileId", cmdiData.getProfileId());
         solrDocument.addField("resourceClassOrig", cmdiData.getOriginalResourceType());
         

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import eu.clarin.cmdi.vlo.pojo.Variant;
-import eu.clarin.cmdi.vlo.pojo.VariantsMap;
 
 /**

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

@@ -4 +4 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
-import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import eu.clarin.cmdi.vlo.normalization.NormalizationService;
+import eu.clarin.cmdi.vlo.normalization.NormalizationVocabulary;
+import eu.clarin.cmdi.vlo.normalization.VocabularyEntry;
 import eu.clarin.cmdi.vlo.pojo.VariantsMap;
-import eu.clarin.cmdi.vlo.pojo.VocabularyEntry;
 import eu.clarin.cmdi.vlo.transformers.VariantsMapMarshaller;
 
@@ -25 +25 @@
  */
 
-public abstract class PostProcessorsWithVocabularyMap implements PostProcessor{
-        
-         private final static Logger _logger = LoggerFactory.getLogger(PostProcessorsWithVocabularyMap.class);
-         
-         private List<VocabularyEntry> map = null;
-                 
-        
-         /*
-          * This method is used for normalization of facet values based on normalization maps.
-          * In case that value is not in the map, the input value is returned.
-          * 
-          * @param value - original value from record
-          * @return normalized value if there is a match otherwise original value
-          * 
-          */
-         public String normalize(String value){
-                 return normalize(value, value);
-         }
-         
-         
-         /*
-          * This method is used for normalization of facet values based on normalization maps.
-          * With second parameter user can specify what to return in case when value is not in normalization map (special case for NationalProject facet).
-          *  
-          * @param value - original value from record
-          * @param fallBackValue - value to be returned in case of no match
-          * @return normalized value if there is a match otherwise returns what is specified with 2nd parameter
-          * 
-          */
-         public String normalize(String value, String fallBackValue){
-                 //init
-                 if(map == null)
-                         createMap();
-                 
-                 int ind = map.indexOf(value);
-                 return (ind != -1)? map.get(ind).getNormalizedValue() : fallBackValue;
-         }
-         
-         public  Map<String, String> getCrossMappings(String value){
-                 
-                 //init
-                 if(map == null)
-                         createMap();
-                 
-                 int ind = map.indexOf(value);
-                 return (ind != -1)? map.get(ind).getCrossMap() : null; 
-         }
-         
-         public abstract String getNormalizationMapURL();
-         
-         private void createMap(){
-                 VariantsMap varinatsRawMap = getMappingFromFile(getNormalizationMapURL());
-                 map = varinatsRawMap.getMap();
-                 
-                 printMap();
-         }
-         
-         protected VariantsMap getMappingFromFile(String mapUrl){
-                 try {
-                        
-                        _logger.info("Reading vocabulary file from: {}", mapUrl);
-                    // load records from file
-                        // in the future this should be loaded from CLAVAS directly and the file only used as fallback
-                        
-                        //InputStream is = PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
-                        InputStream is = new FileInputStream(new File(mapUrl));
+public abstract class PostProcessorsWithVocabularyMap implements PostProcessor, NormalizationService {
 
-                        
-                        return VariantsMapMarshaller.unmarshal(is);                     
-             } catch (Exception e) {
-            throw new RuntimeException("Cannot instantiate postProcessor:", e);
-         }
-         }
-         
-         
-         // for debug
-         public void printMap(){
-                 _logger.info("map contains {} entries", map.size());
-                 for(VocabularyEntry entry: map)
-                         _logger.info(entry.toString());
-                
-         }
+        private final static Logger _logger = LoggerFactory.getLogger(PostProcessorsWithVocabularyMap.class);
+
+        private NormalizationVocabulary vocabulary;
+
+        public String normalize(String value) {
+                return normalize(value, value);
+        }
+
+        public String normalize(String value, String fallBackValue) {
+                if (vocabulary == null)
+                        initVocabulary();
+
+                return vocabulary.normalize(value, fallBackValue);
+        }
+
+        public Map<String, String> getCrossMappings(String value) {
+                if (vocabulary == null)
+                        initVocabulary();
+
+                return vocabulary.getCrossMappings(value);
+        }
+
+        public abstract String getNormalizationMapURL();
+
+        private void initVocabulary() {
+                VariantsMap varinatsRawMap = getMappingFromFile(getNormalizationMapURL());
+                vocabulary = varinatsRawMap.getMap();
+
+                printMap();
+        }
+
+        protected VariantsMap getMappingFromFile(String mapUrl) {
+                try {
+
+                        _logger.info("Reading vocabulary file from: {}", mapUrl);
+                        // load records from file
+                        // in the future this should be loaded from CLAVAS directly and the
+                        // file only used as fallback
+
+                        // InputStream is =
+                        // PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
+                        InputStream is = new FileInputStream(new File(mapUrl));
+
+                        return VariantsMapMarshaller.unmarshal(is);
+                } catch (Exception e) {
+                        throw new RuntimeException("Cannot instantiate postProcessor:", e);
+                }
+        }
+
+        // for debug
+        public void printMap() {
+                _logger.info("map contains {} entries", vocabulary.getEntries().length);
+                for(int i = 0; i < vocabulary.getEntries().length; i++)
+                        _logger.info(vocabulary.getEntries()[i].toString());
+                        
+
+        }
 }