Project

General

Profile

« Previous | Next » 

Revision 51952

added more VTDUtilities

View differences:

modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/transform/xml/AbstractDNetXsltFunctions.java
1204 1204
			final boolean inferred) {
1205 1205

  
1206 1206
		final DataInfo.Builder dataInfoBuilder = DataInfo.newBuilder();
1207
		dataInfoBuilder.setInvisible(Boolean.valueOf(invisible));
1208
		dataInfoBuilder.setInferred(Boolean.valueOf(inferred));
1209
		dataInfoBuilder.setDeletedbyinference(Boolean.valueOf(deletedbyinference));
1207
		dataInfoBuilder.setInvisible(invisible);
1208
		dataInfoBuilder.setInferred(inferred);
1209
		dataInfoBuilder.setDeletedbyinference(deletedbyinference);
1210 1210
		dataInfoBuilder.setTrust(trust);
1211 1211
		dataInfoBuilder.setProvenanceaction(getSimpleQualifier(provenanceaction, "dnet:provenanceActions").build());
1212 1212

  
modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/transform/xml/vtd/PublicationToProto.java
26 26
    private String trust;
27 27
    private String provenance;
28 28

  
29
    public PublicationToProto(final boolean invisible) {
29
    public PublicationToProto(final boolean invisible, final String trust, final String provenance) {
30 30
        this.invisible = invisible;
31
        this.trust = trust;
32
        this.provenance = provenance;
31 33
    }
32 34

  
33 35
    public List<Oaf> apply(final String xml) throws VtdException {
......
74 76

  
75 77
        final Metadata.Builder oafMetadata = buildMetadata(ap, vn, mDesc);
76 78
        final Result.Builder oafResult = buildResult(oafMetadata, ap, vn, collectedFrom, hostedBy);
77
        final OafProtos.OafEntity.Builder oafEntity = buildOafEntity(oafResult, objIdentifier, ap, vn, collectedFrom, originalId, dateOfCollection, dateOfTransformation);
79
        final OafProtos.OafEntity.Builder oafEntity = buildOafEntity(ap, vn,oafResult, objIdentifier,  collectedFrom, originalId, dateOfCollection, dateOfTransformation);
78 80
        oafEntity.setOaiprovenance(getOaiProvenance(ap, vn));
79 81

  
80
        final Oaf oaf = getOaf(oafEntity,
81
                buildDataInfo(invisible, ap, vn, provenance,trust, false, false), ap, vn);
82
        final Oaf oaf = getOaf(ap, vn, oafEntity,
83
                buildDataInfo( ap, vn, invisible, provenance,trust, false, false));
82 84
        result.add(oaf);
83 85
        return result;
84 86
    }
modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/transform/xml/vtd/AbstractVtdParser.java
317 317
    }
318 318

  
319 319
    // Builder for Entities
320
    protected static OafProtos.Oaf getOaf(final OafProtos.OafEntity.Builder entity, final FieldTypeProtos.DataInfo.Builder info,final AutoPilot ap,
321
                                          final VTDNav vn) throws VtdException {
322
        return _getOaf(OafProtos.Oaf.newBuilder(), info, ap, vn).setKind(KindProtos.Kind.entity).setEntity(entity).build();
320
    protected static OafProtos.Oaf getOaf(final AutoPilot ap,
321
                                           final VTDNav vn, final OafProtos.OafEntity.Builder entity, final FieldTypeProtos.DataInfo.Builder info) throws VtdException {
322
        return _getOaf(ap, vn, OafProtos.Oaf.newBuilder(), info ).setKind(KindProtos.Kind.entity).setEntity(entity).build();
323 323
    }
324 324

  
325
    private static OafProtos.Oaf.Builder _getOaf(final OafProtos.Oaf.Builder oaf, final FieldTypeProtos.DataInfo.Builder info,final AutoPilot ap,
326
                                                 final VTDNav vn) throws VtdException {
325
    private static OafProtos.Oaf.Builder _getOaf(final AutoPilot ap,
326
                                                 final VTDNav vn, final OafProtos.Oaf.Builder oaf, final FieldTypeProtos.DataInfo.Builder info) throws VtdException {
327 327
        if (info != null) {
328
            return oaf.setDataInfo(ensureDataInfo(info, ap, vn));
328
            return oaf.setDataInfo(ensureDataInfo( ap, vn, info));
329 329
        } else return oaf;
330 330
    }
331
    protected static FieldTypeProtos.DataInfo.Builder ensureDataInfo(final FieldTypeProtos.DataInfo.Builder info,
332
                                                                     final AutoPilot ap,
333
                                                                     final VTDNav vn) throws VtdException {
331
    protected static FieldTypeProtos.DataInfo.Builder ensureDataInfo(final AutoPilot ap, final VTDNav vn,
332
                                                                     final FieldTypeProtos.DataInfo.Builder info) throws VtdException {
334 333
        if (info.isInitialized()) return info;
335
        return buildDataInfo(false, ap, vn, "UNKNOWN", "0.9", false, false);
334
        return buildDataInfo( ap, vn,false, "UNKNOWN", "0.9", false, false);
336 335
    }
337 336

  
338 337
    protected static FieldTypeProtos.DataInfo.Builder buildDataInfo(
339
            final boolean invisible,
340 338
            final AutoPilot ap,
341 339
            final VTDNav vn,
340
            final boolean invisible,
342 341
            final String provenanceaction,
343 342
            final String trust,
344 343
            final boolean deletedbyinference,

Also available in: Unified diff