Revision 49566
Added by Claudio Atzori over 6 years ago
| modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/transform/xml/AbstractDNetXsltFunctions.java | ||
|---|---|---|
| 1185 | 1185 |
return builder; |
| 1186 | 1186 |
} |
| 1187 | 1187 |
|
| 1188 |
public static DataInfo.Builder getDataInfo( |
|
| 1189 |
final NodeList about, |
|
| 1190 |
final String provenanceaction, |
|
| 1191 |
final String trust, |
|
| 1192 |
final boolean deletedbyinference, |
|
| 1193 |
final boolean inferred) {
|
|
| 1194 |
return getDataInfo(false, about, provenanceaction, trust, deletedbyinference, inferred); |
|
| 1195 |
} |
|
| 1196 |
|
|
| 1188 | 1197 |
public static DataInfo.Builder getDataInfo(final boolean invisible, |
| 1189 | 1198 |
final NodeList about, |
| 1190 | 1199 |
final String provenanceaction, |
| modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/transform/OafEntityMerger.java | ||
|---|---|---|
| 21 | 21 |
import eu.dnetlib.data.proto.ResultProtos.Result; |
| 22 | 22 |
import eu.dnetlib.data.proto.ResultProtos.Result.Instance; |
| 23 | 23 |
import eu.dnetlib.data.proto.SpecialTrustProtos.SpecialTrust; |
| 24 |
import eu.dnetlib.data.proto.TypeProtos.Type; |
|
| 24 | 25 |
import eu.dnetlib.pace.config.DedupConfig; |
| 25 | 26 |
import org.apache.commons.lang.StringUtils; |
| 26 | 27 |
|
| ... | ... | |
| 59 | 60 |
if (!currentTrust.equals(SpecialTrust.NEUTRAL.toString())) {
|
| 60 | 61 |
trust = currentTrust; |
| 61 | 62 |
} |
| 63 |
|
|
| 62 | 64 |
builder.mergeFrom(oaf); |
| 65 |
|
|
| 66 |
if (oaf.getEntity().getType().equals(Type.result)) {
|
|
| 67 |
builder.getEntityBuilder().getResultBuilder().getMetadataBuilder().clearAuthor(); |
|
| 68 |
builder.getEntityBuilder().getResultBuilder().getMetadataBuilder().addAllAuthor(oaf.getEntity().getResult().getMetadata().getAuthorList()); |
|
| 69 |
} |
|
| 63 | 70 |
} |
| 64 | 71 |
|
| 65 | 72 |
builder = doMergeEntities(builder); |
| ... | ... | |
| 122 | 129 |
setUniqueStringField(result, field); |
| 123 | 130 |
} |
| 124 | 131 |
|
| 125 |
// remove the inner authors, rely on the children |
|
| 126 |
builder.getEntityBuilder().getResultBuilder().getMetadataBuilder().clearAuthor(); |
|
| 127 | 132 |
break; |
| 128 | 133 |
default: |
| 129 | 134 |
break; |
Also available in: Unified diff
fixed authors merge process