Changeset 6728

Timestamp:

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

Author:

davor.ostojic@oeaw.ac.at

Message:

NormalizationService? and NormalizationVocabulary? as top level classes

Location:

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

Files:

• normalization (added)
• normalization/NormalizationService.java (added)
• normalization/NormalizationVocabulary.java (added)
• normalization/VocabularyEntry.java (moved) (moved from vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VocabularyEntry.java) (3 diffs)
• pojo/VariantsMap.java (modified) (4 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization/VocabularyEntry.java

@@ -1 @@
-package eu.clarin.cmdi.vlo.pojo;
+package eu.clarin.cmdi.vlo.normalization;
 
 import java.util.HashMap;
@@ -6 +6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import eu.clarin.cmdi.vlo.pojo.CrossMapping;
 
 public class VocabularyEntry {
@@ -62 +64 @@
         
         
-        /*
-         * Overridden for Collection.contains method
-         */
-        
-        @Override
-        public boolean equals(Object obj) {
-                if(obj == null || !(obj instanceof String))
-                        return false;
-                String val = (String) obj;
-                if(!isRegEx)
-                        return this.originalVal.equals(val) || this.normalizedValue.equals(val);
-                
-                return Pattern.compile(this.getOriginalVal()).matcher(val).find();
-                
-        }
-        
         @Override
         public String toString() {

vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pojo;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -11 +11 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+
+import eu.clarin.cmdi.vlo.normalization.NormalizationVocabulary;
+import eu.clarin.cmdi.vlo.normalization.VocabularyEntry;
 
 /**
@@ -46 +49 @@
         
          /**
-     * returns inverted map variant-normalizedVal
+     * returns inverted map: variant-normalizedVal
      *
      */
@@ -63 +66 @@
         
         
-        public List<VocabularyEntry> getMap(){
-                List map = new LinkedList<VocabularyEntry>();
+        public NormalizationVocabulary getMap(){
+                List<VocabularyEntry> listOfEntries = new ArrayList<VocabularyEntry>();
+                boolean containsRegEx = false;
                 
                 for(Mapping m: mappings)
                         if(m.getVariants() != null)
                                 for(Variant v: m.getVariants()){                                        
-                                        map.add(new VocabularyEntry(v.getValue().trim(), m.getValue().trim(), v.isRegExp(), v.getCrossMappings()));
+                                        listOfEntries.add(new VocabularyEntry(v.getValue().trim(), m.getValue().trim(), v.isRegExp(), v.getCrossMappings()));
+                                        if(v.isRegExp())
+                                                containsRegEx = true;
                                 }
-                
-                return map;
+
+                return new NormalizationVocabulary(listOfEntries.toArray(new VocabularyEntry[0]), containsRegEx); 
                 
         }