2021-05-10 16:43:39 +02:00
|
|
|
|
|
|
|
package eu.dnetlib.dhp.schema.oaf.utils;
|
|
|
|
|
2021-06-11 16:53:01 +02:00
|
|
|
import java.time.LocalDate;
|
|
|
|
import java.time.ZoneId;
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
import java.time.format.DateTimeParseException;
|
2021-05-10 16:43:39 +02:00
|
|
|
import java.util.*;
|
|
|
|
import java.util.function.Function;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
2021-06-11 16:53:01 +02:00
|
|
|
import com.github.sisyphsu.dateparser.DateParserUtils;
|
2021-05-10 16:43:39 +02:00
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import com.google.common.collect.Sets;
|
|
|
|
|
|
|
|
import eu.dnetlib.dhp.schema.common.ModelConstants;
|
2021-05-28 10:50:44 +02:00
|
|
|
import eu.dnetlib.dhp.schema.common.ModelSupport;
|
2021-05-10 16:43:39 +02:00
|
|
|
import eu.dnetlib.dhp.schema.oaf.*;
|
2021-07-28 16:21:29 +02:00
|
|
|
import me.xuender.unidecode.Unidecode;
|
2021-05-10 16:43:39 +02:00
|
|
|
|
|
|
|
public class GraphCleaningFunctions extends CleaningFunctions {
|
|
|
|
|
2021-06-14 09:40:50 +02:00
|
|
|
public static final String ORCID_CLEANING_REGEX = ".*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9x]{4})";
|
|
|
|
public static final int ORCID_LEN = 19;
|
2021-05-10 16:43:39 +02:00
|
|
|
public static final String CLEANING_REGEX = "(?:\\n|\\r|\\t)";
|
|
|
|
public static final String INVALID_AUTHOR_REGEX = ".*deactivated.*";
|
2021-11-16 15:24:23 +01:00
|
|
|
public static final String TITLE_FILTER_REGEX = "(test)|\\W|\\d";
|
|
|
|
public static final int TITLE_FILTER_RESIDUAL_LENGTH = 5;
|
2021-05-10 16:43:39 +02:00
|
|
|
|
|
|
|
public static <T extends Oaf> T fixVocabularyNames(T value) {
|
|
|
|
if (value instanceof Datasource) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Project) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Organization) {
|
|
|
|
Organization o = (Organization) value;
|
|
|
|
if (Objects.nonNull(o.getCountry())) {
|
|
|
|
fixVocabName(o.getCountry(), ModelConstants.DNET_COUNTRY_TYPE);
|
|
|
|
}
|
|
|
|
} else if (value instanceof Relation) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Result) {
|
|
|
|
|
|
|
|
Result r = (Result) value;
|
|
|
|
|
|
|
|
fixVocabName(r.getLanguage(), ModelConstants.DNET_LANGUAGES);
|
|
|
|
fixVocabName(r.getResourcetype(), ModelConstants.DNET_DATA_CITE_RESOURCE);
|
|
|
|
fixVocabName(r.getBestaccessright(), ModelConstants.DNET_ACCESS_MODES);
|
|
|
|
|
|
|
|
if (Objects.nonNull(r.getSubject())) {
|
|
|
|
r.getSubject().forEach(s -> fixVocabName(s.getQualifier(), ModelConstants.DNET_SUBJECT_TYPOLOGIES));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getInstance())) {
|
|
|
|
for (Instance i : r.getInstance()) {
|
|
|
|
fixVocabName(i.getAccessright(), ModelConstants.DNET_ACCESS_MODES);
|
|
|
|
fixVocabName(i.getRefereed(), ModelConstants.DNET_REVIEW_LEVELS);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getAuthor())) {
|
|
|
|
r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
|
|
|
|
if (Objects.nonNull(a.getPid())) {
|
|
|
|
a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
|
|
|
|
fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if (value instanceof Publication) {
|
|
|
|
|
|
|
|
} else if (value instanceof Dataset) {
|
|
|
|
|
|
|
|
} else if (value instanceof OtherResearchProduct) {
|
|
|
|
|
|
|
|
} else if (value instanceof Software) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Oaf> boolean filter(T value) {
|
|
|
|
if (value instanceof Datasource) {
|
|
|
|
// nothing to evaluate here
|
|
|
|
} else if (value instanceof Project) {
|
|
|
|
// nothing to evaluate here
|
|
|
|
} else if (value instanceof Organization) {
|
|
|
|
// nothing to evaluate here
|
|
|
|
} else if (value instanceof Relation) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Result) {
|
|
|
|
|
|
|
|
Result r = (Result) value;
|
|
|
|
|
2021-07-23 11:55:55 +02:00
|
|
|
if (Objects.isNull(r.getTitle()) || r.getTitle().isEmpty()) {
|
2021-05-10 16:43:39 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value instanceof Publication) {
|
|
|
|
|
|
|
|
} else if (value instanceof Dataset) {
|
|
|
|
|
|
|
|
} else if (value instanceof OtherResearchProduct) {
|
|
|
|
|
|
|
|
} else if (value instanceof Software) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static <T extends Oaf> T cleanup(T value) {
|
|
|
|
if (value instanceof Datasource) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Project) {
|
|
|
|
// nothing to clean here
|
|
|
|
} else if (value instanceof Organization) {
|
|
|
|
Organization o = (Organization) value;
|
|
|
|
if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
|
|
|
|
o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
|
|
|
|
}
|
|
|
|
} else if (value instanceof Relation) {
|
2021-05-28 10:50:44 +02:00
|
|
|
Relation r = (Relation) value;
|
|
|
|
|
2021-06-11 16:53:01 +02:00
|
|
|
Optional<String> validationDate = doCleanDate(r.getValidationDate());
|
|
|
|
if (validationDate.isPresent()) {
|
|
|
|
r.setValidationDate(validationDate.get());
|
|
|
|
r.setValidated(true);
|
|
|
|
} else {
|
2021-05-28 10:50:44 +02:00
|
|
|
r.setValidationDate(null);
|
|
|
|
r.setValidated(false);
|
|
|
|
}
|
2021-05-10 16:43:39 +02:00
|
|
|
} else if (value instanceof Result) {
|
|
|
|
|
|
|
|
Result r = (Result) value;
|
2021-06-11 16:53:01 +02:00
|
|
|
|
|
|
|
if (Objects.nonNull(r.getDateofacceptance())) {
|
|
|
|
Optional<String> date = cleanDateField(r.getDateofacceptance());
|
|
|
|
if (date.isPresent()) {
|
|
|
|
r.getDateofacceptance().setValue(date.get());
|
|
|
|
} else {
|
|
|
|
r.setDateofacceptance(null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getRelevantdate())) {
|
|
|
|
r
|
|
|
|
.setRelevantdate(
|
|
|
|
r
|
|
|
|
.getRelevantdate()
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(sp -> Objects.nonNull(sp.getQualifier()))
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
|
|
|
|
.map(sp -> {
|
|
|
|
sp.setValue(GraphCleaningFunctions.cleanDate(sp.getValue()));
|
|
|
|
return sp;
|
|
|
|
})
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
2021-05-10 16:43:39 +02:00
|
|
|
if (Objects.nonNull(r.getPublisher()) && StringUtils.isBlank(r.getPublisher().getValue())) {
|
|
|
|
r.setPublisher(null);
|
|
|
|
}
|
|
|
|
if (Objects.isNull(r.getLanguage()) || StringUtils.isBlank(r.getLanguage().getClassid())) {
|
|
|
|
r
|
|
|
|
.setLanguage(
|
|
|
|
qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getSubject())) {
|
|
|
|
r
|
|
|
|
.setSubject(
|
|
|
|
r
|
|
|
|
.getSubject()
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
|
|
|
|
.filter(sp -> Objects.nonNull(sp.getQualifier()))
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
|
|
|
|
.map(GraphCleaningFunctions::cleanValue)
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getTitle())) {
|
|
|
|
r
|
|
|
|
.setTitle(
|
|
|
|
r
|
|
|
|
.getTitle()
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
|
|
|
|
.filter(
|
2021-07-28 16:21:29 +02:00
|
|
|
sp -> {
|
|
|
|
final String title = sp
|
|
|
|
.getValue()
|
|
|
|
.toLowerCase();
|
|
|
|
final String residual = Unidecode
|
|
|
|
.decode(title)
|
|
|
|
.replaceAll(TITLE_FILTER_REGEX, "");
|
|
|
|
return residual.length() > TITLE_FILTER_RESIDUAL_LENGTH;
|
|
|
|
})
|
2021-05-10 16:43:39 +02:00
|
|
|
.map(GraphCleaningFunctions::cleanValue)
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getDescription())) {
|
|
|
|
r
|
|
|
|
.setDescription(
|
|
|
|
r
|
|
|
|
.getDescription()
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
|
|
|
|
.map(GraphCleaningFunctions::cleanValue)
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getPid())) {
|
|
|
|
r.setPid(processPidCleaning(r.getPid()));
|
|
|
|
}
|
|
|
|
if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
|
|
|
|
r
|
|
|
|
.setResourcetype(
|
|
|
|
qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getInstance())) {
|
|
|
|
|
|
|
|
for (Instance i : r.getInstance()) {
|
2021-06-24 12:10:17 +02:00
|
|
|
if (Objects.nonNull(i.getPid())) {
|
|
|
|
i.setPid(processPidCleaning(i.getPid()));
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(i.getAlternateIdentifier())) {
|
|
|
|
i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
|
|
|
|
}
|
2021-05-10 16:43:39 +02:00
|
|
|
Optional
|
|
|
|
.ofNullable(i.getPid())
|
|
|
|
.ifPresent(pid -> {
|
2021-06-24 12:10:17 +02:00
|
|
|
final Set<StructuredProperty> pids = Sets.newHashSet(pid);
|
2021-05-10 16:43:39 +02:00
|
|
|
Optional
|
|
|
|
.ofNullable(i.getAlternateIdentifier())
|
|
|
|
.ifPresent(altId -> {
|
2021-06-24 12:10:17 +02:00
|
|
|
final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
|
2021-05-10 16:43:39 +02:00
|
|
|
i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
|
|
|
|
i
|
|
|
|
.setAccessright(
|
|
|
|
accessRight(
|
|
|
|
ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
|
|
|
|
ModelConstants.DNET_ACCESS_MODES));
|
|
|
|
}
|
|
|
|
if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
|
|
|
|
i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
|
|
|
|
}
|
|
|
|
if (Objects.isNull(i.getRefereed())) {
|
|
|
|
i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
|
|
|
|
}
|
2021-06-11 16:53:01 +02:00
|
|
|
if (Objects.nonNull(i.getDateofacceptance())) {
|
|
|
|
Optional<String> date = cleanDateField(i.getDateofacceptance());
|
|
|
|
if (date.isPresent()) {
|
|
|
|
i.getDateofacceptance().setValue(date.get());
|
|
|
|
} else {
|
|
|
|
i.setDateofacceptance(null);
|
|
|
|
}
|
|
|
|
}
|
2021-05-10 16:43:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
|
|
|
|
Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
|
|
|
|
if (Objects.isNull(bestaccessrights)) {
|
|
|
|
r
|
|
|
|
.setBestaccessright(
|
|
|
|
qualifier(
|
|
|
|
ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
|
|
|
|
ModelConstants.DNET_ACCESS_MODES));
|
|
|
|
} else {
|
|
|
|
r.setBestaccessright(bestaccessrights);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Objects.nonNull(r.getAuthor())) {
|
2021-06-14 09:40:50 +02:00
|
|
|
r
|
|
|
|
.setAuthor(
|
|
|
|
r
|
|
|
|
.getAuthor()
|
|
|
|
.stream()
|
2021-08-11 12:13:22 +02:00
|
|
|
.filter(Objects::nonNull)
|
2021-06-14 09:40:50 +02:00
|
|
|
.filter(a -> StringUtils.isNotBlank(a.getFullname()))
|
|
|
|
.filter(a -> StringUtils.isNotBlank(a.getFullname().replaceAll("[\\W]", "")))
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
|
|
|
|
boolean nullRank = r
|
|
|
|
.getAuthor()
|
|
|
|
.stream()
|
|
|
|
.anyMatch(a -> Objects.isNull(a.getRank()));
|
|
|
|
if (nullRank) {
|
|
|
|
int i = 1;
|
|
|
|
for (Author author : r.getAuthor()) {
|
|
|
|
author.setRank(i++);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-10 16:43:39 +02:00
|
|
|
for (Author a : r.getAuthor()) {
|
|
|
|
if (Objects.isNull(a.getPid())) {
|
|
|
|
a.setPid(Lists.newArrayList());
|
|
|
|
} else {
|
|
|
|
a
|
|
|
|
.setPid(
|
|
|
|
a
|
|
|
|
.getPid()
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(p -> Objects.nonNull(p.getQualifier()))
|
|
|
|
.filter(p -> StringUtils.isNotBlank(p.getValue()))
|
|
|
|
.map(p -> {
|
2021-06-14 09:40:50 +02:00
|
|
|
// hack to distinguish orcid from orcid_pending
|
|
|
|
String pidProvenance = Optional
|
|
|
|
.ofNullable(p.getDataInfo())
|
|
|
|
.map(
|
|
|
|
d -> Optional
|
|
|
|
.ofNullable(d.getProvenanceaction())
|
|
|
|
.map(Qualifier::getClassid)
|
|
|
|
.orElse(""))
|
|
|
|
.orElse("");
|
|
|
|
if (p
|
|
|
|
.getQualifier()
|
|
|
|
.getClassid()
|
|
|
|
.toLowerCase()
|
|
|
|
.contains(ModelConstants.ORCID)) {
|
|
|
|
if (pidProvenance
|
|
|
|
.equals(ModelConstants.SYSIMPORT_CROSSWALK_ENTITYREGISTRY)) {
|
|
|
|
p.getQualifier().setClassid(ModelConstants.ORCID);
|
|
|
|
} else {
|
|
|
|
p.getQualifier().setClassid(ModelConstants.ORCID_PENDING);
|
|
|
|
}
|
|
|
|
final String orcid = p
|
|
|
|
.getValue()
|
|
|
|
.trim()
|
|
|
|
.toLowerCase()
|
|
|
|
.replaceAll(ORCID_CLEANING_REGEX, "$1-$2-$3-$4");
|
|
|
|
if (orcid.length() == ORCID_LEN) {
|
|
|
|
p.setValue(orcid);
|
|
|
|
} else {
|
|
|
|
p.setValue("");
|
|
|
|
}
|
|
|
|
}
|
2021-05-10 16:43:39 +02:00
|
|
|
return p;
|
|
|
|
})
|
|
|
|
.filter(p -> StringUtils.isNotBlank(p.getValue()))
|
|
|
|
.collect(
|
|
|
|
Collectors
|
|
|
|
.toMap(
|
2021-06-14 09:40:50 +02:00
|
|
|
p -> p.getQualifier().getClassid() + p.getValue(),
|
|
|
|
Function.identity(),
|
|
|
|
(p1, p2) -> p1,
|
2021-05-10 16:43:39 +02:00
|
|
|
LinkedHashMap::new))
|
|
|
|
.values()
|
|
|
|
.stream()
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (value instanceof Publication) {
|
|
|
|
|
|
|
|
} else if (value instanceof Dataset) {
|
|
|
|
|
|
|
|
} else if (value instanceof OtherResearchProduct) {
|
|
|
|
|
|
|
|
} else if (value instanceof Software) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2021-06-11 16:53:01 +02:00
|
|
|
private static Optional<String> cleanDateField(Field<String> dateofacceptance) {
|
|
|
|
return Optional
|
|
|
|
.ofNullable(dateofacceptance)
|
|
|
|
.map(Field::getValue)
|
|
|
|
.map(GraphCleaningFunctions::cleanDate)
|
|
|
|
.filter(Objects::nonNull);
|
|
|
|
}
|
|
|
|
|
|
|
|
protected static Optional<String> doCleanDate(String date) {
|
|
|
|
return Optional.ofNullable(cleanDate(date));
|
|
|
|
}
|
|
|
|
|
|
|
|
public static String cleanDate(final String inputDate) {
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(inputDate)) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
final LocalDate date = DateParserUtils
|
|
|
|
.parseDate(inputDate.trim())
|
|
|
|
.toInstant()
|
|
|
|
.atZone(ZoneId.systemDefault())
|
|
|
|
.toLocalDate();
|
|
|
|
return DateTimeFormatter.ofPattern(ModelSupport.DATE_FORMAT).format(date);
|
|
|
|
} catch (DateTimeParseException e) {
|
|
|
|
return null;
|
|
|
|
}
|
2021-05-28 10:50:44 +02:00
|
|
|
}
|
|
|
|
|
2021-05-10 16:43:39 +02:00
|
|
|
// HELPERS
|
|
|
|
|
|
|
|
private static boolean isValidAuthorName(Author a) {
|
|
|
|
return !Stream
|
|
|
|
.of(a.getFullname(), a.getName(), a.getSurname())
|
|
|
|
.filter(s -> s != null && !s.isEmpty())
|
|
|
|
.collect(Collectors.joining(""))
|
|
|
|
.toLowerCase()
|
|
|
|
.matches(INVALID_AUTHOR_REGEX);
|
|
|
|
}
|
|
|
|
|
|
|
|
private static List<StructuredProperty> processPidCleaning(List<StructuredProperty> pids) {
|
|
|
|
return pids
|
|
|
|
.stream()
|
|
|
|
.filter(Objects::nonNull)
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
|
|
|
|
.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
|
|
|
|
.filter(sp -> Objects.nonNull(sp.getQualifier()))
|
|
|
|
.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
|
|
|
|
.map(CleaningFunctions::normalizePidValue)
|
|
|
|
.filter(CleaningFunctions::pidFilter)
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
}
|
|
|
|
|
|
|
|
private static void fixVocabName(Qualifier q, String vocabularyName) {
|
|
|
|
if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
|
|
|
|
q.setSchemeid(vocabularyName);
|
|
|
|
q.setSchemename(vocabularyName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private static AccessRight accessRight(String classid, String classname, String scheme) {
|
|
|
|
return OafMapperUtils
|
|
|
|
.accessRight(
|
|
|
|
classid, classname, scheme, scheme);
|
|
|
|
}
|
|
|
|
|
|
|
|
private static Qualifier qualifier(String classid, String classname, String scheme) {
|
|
|
|
return OafMapperUtils
|
|
|
|
.qualifier(
|
|
|
|
classid, classname, scheme, scheme);
|
|
|
|
}
|
|
|
|
|
|
|
|
protected static StructuredProperty cleanValue(StructuredProperty s) {
|
|
|
|
s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
protected static Field<String> cleanValue(Field<String> s) {
|
|
|
|
s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|