- Timestamp:
- 11/02/15 15:22:08 (9 years ago)
- Location:
- vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo
- Files:
-
- 3 added
- 1 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization/VocabularyEntry.java
r6726 r6728 1 package eu.clarin.cmdi.vlo. pojo;1 package eu.clarin.cmdi.vlo.normalization; 2 2 3 3 import java.util.HashMap; … … 6 6 import java.util.regex.Matcher; 7 7 import java.util.regex.Pattern; 8 9 import eu.clarin.cmdi.vlo.pojo.CrossMapping; 8 10 9 11 public class VocabularyEntry { … … 62 64 63 65 64 /*65 * Overridden for Collection.contains method66 */67 68 @Override69 public boolean equals(Object obj) {70 if(obj == null || !(obj instanceof String))71 return false;72 String val = (String) obj;73 if(!isRegEx)74 return this.originalVal.equals(val) || this.normalizedValue.equals(val);75 76 return Pattern.compile(this.getOriginalVal()).matcher(val).find();77 78 }79 80 66 @Override 81 67 public String toString() { -
vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java
r6727 r6728 1 1 package eu.clarin.cmdi.vlo.pojo; 2 2 3 import java.util. LinkedList;3 import java.util.ArrayList; 4 4 import java.util.List; 5 5 import java.util.Map; … … 11 11 import javax.xml.bind.annotation.XmlElement; 12 12 import javax.xml.bind.annotation.XmlRootElement; 13 14 import eu.clarin.cmdi.vlo.normalization.NormalizationVocabulary; 15 import eu.clarin.cmdi.vlo.normalization.VocabularyEntry; 13 16 14 17 /** … … 46 49 47 50 /** 48 * returns inverted map variant-normalizedVal51 * returns inverted map: variant-normalizedVal 49 52 * 50 53 */ … … 63 66 64 67 65 public List<VocabularyEntry> getMap(){ 66 List map = new LinkedList<VocabularyEntry>(); 68 public NormalizationVocabulary getMap(){ 69 List<VocabularyEntry> listOfEntries = new ArrayList<VocabularyEntry>(); 70 boolean containsRegEx = false; 67 71 68 72 for(Mapping m: mappings) 69 73 if(m.getVariants() != null) 70 74 for(Variant v: m.getVariants()){ 71 map.add(new VocabularyEntry(v.getValue().trim(), m.getValue().trim(), v.isRegExp(), v.getCrossMappings())); 75 listOfEntries.add(new VocabularyEntry(v.getValue().trim(), m.getValue().trim(), v.isRegExp(), v.getCrossMappings())); 76 if(v.isRegExp()) 77 containsRegEx = true; 72 78 } 73 74 return map;79 80 return new NormalizationVocabulary(listOfEntries.toArray(new VocabularyEntry[0]), containsRegEx); 75 81 76 82 }
Note: See TracChangeset
for help on using the changeset viewer.