Project

General

Profile

« Previous | Next » 

Revision 58086

serializing processingchargeamount and currency

View differences:

modules/dnet-mapreduce-jobs/trunk/src/test/resources/eu/dnetlib/data/transform/record.xml
56 56
    <oaf:collectedFrom id="opendoar____::296" name="Tesis Doctorals en Xarxa"/>
57 57
    <oaf:journal eissn="" ep="238" iss="February" issn="" sp="231" vol="1II">Constatin Brancusi University of Targu Jiu Annals - Economy Series</oaf:journal>
58 58
    <oaf:refereed>Peer-reviewed</oaf:refereed>
59
<!--    <oaf:processingchargeamount currency="EUR">1721.47</oaf:processingchargeamount>-->
59
    <oaf:processingchargeamount currency="EUR">1721.47</oaf:processingchargeamount>
60 60
  </metadata>
61 61

  
62 62
</record>
modules/dnet-mapreduce-jobs/trunk/src/test/resources/eu/dnetlib/data/transform/recordDatacite.xml
114 114
    <oaf:hostedBy name="Unknown Repository" id="openaire____::1256f046-bf1f-4afc-8b47-d0b147148b18"/>
115 115
    <oaf:collectedFrom name="Datacite" id="openaire____::datacite"/>
116 116
    <oaf:journal ep="" iss="8" issn="1388-9842" sp="" vol="19" xml:lang="en">European Journal of Heart Failure</oaf:journal>
117
    <oaf:refereed>Peer-reviewed</oaf:refereed>
118
    <oaf:processingchargeamount currency="EUR">1721.47</oaf:processingchargeamount>
117 119
  </metadata>
118 120
  <about xmlns:dri="http://www.driver-repository.eu/namespace/dri" xmlns:oai="http://www.openarchives.org/OAI/2.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:prov="http://www.openarchives.org/OAI/2.0/provenance">
119 121
    <provenance xmlns="http://www.openarchives.org/OAI/2.0/provenance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/provenance http://www.openarchives.org/OAI/2.0/provenance.xsd">
modules/dnet-mapreduce-jobs/trunk/src/main/java/eu/dnetlib/data/mapreduce/util/XmlRecordFactory.java
309 309
		final OafEntityDecoder entity = mainEntity.decodeEntity();
310 310
		if (entity.getType().equals(Type.result)) {
311 311
			for (final Instance instance : ((Result) entity.getEntity()).getInstanceList()) {
312
				children.add(templateFactory.getInstance(instance.getHostedby().getKey(), listFields(instance, instanceFilter, false, false),
312
				final List<String> instancemetadata = listFields(instance, instanceFilter, false, false);
313

  
314
				if (instance.hasProcessingchargeamount()) {
315
					instancemetadata.add("<processingchargeamount currency=\""
316
							+ instance.getProcessingchargecurrency().getValue() + "\">"
317
							+ instance.getProcessingchargeamount().getValue()
318
							+ "</processingchargeamount>");
319
				}
320

  
321
				children.add(templateFactory.getInstance(instance.getHostedby().getKey(), instancemetadata,
313 322
						listMap(instance.getUrlList(), identifier -> templateFactory.getWebResource(identifier))));
314 323
			}
315 324
			for (final ExternalReference er : ((Result) entity.getEntity()).getExternalReferenceList()) {

Also available in: Unified diff