Project

General

Profile

« Previous | Next » 

Revision 50032

fixed scholix version and Date mapping

View differences:

HBaseTableDAO.java
14 14
import eu.dnetlib.data.graph.model.DNGFRowKeyDecoder;
15 15
import eu.dnetlib.data.graph.utils.RelDescriptor;
16 16
import eu.dnetlib.data.mapreduce.JobParams;
17
import eu.dnetlib.data.proto.*;
17 18
import eu.dnetlib.data.proto.DNGFProtos.DNGF;
18 19
import eu.dnetlib.data.proto.DNGFProtos.DNGFRel;
19 20
import eu.dnetlib.data.proto.DNGFProtos.DNGFRel.Builder;
......
22 23
import eu.dnetlib.data.proto.FieldTypeProtos.KeyValue;
23 24
import eu.dnetlib.data.proto.FieldTypeProtos.Qualifier;
24 25
import eu.dnetlib.data.proto.TypeProtos.Type;
26
import eu.dnetlib.data.proto.WDSFieldTypeProtos;
27
import eu.dnetlib.data.proto.WdsDatasetProtos;
28
import eu.dnetlib.data.proto.WdsPublicationProtos;
25 29
import eu.dnetlib.data.transform.Ontologies;
26 30
import org.apache.commons.lang3.StringUtils;
27 31
import org.apache.hadoop.hbase.client.Put;
......
340 344
	}
341 345

  
342 346
	public static DNGF parseProto(final byte[] value) {
343
		final DNGFDecoder d = DNGFDecoder.decode(value, DliFieldTypeProtos.completionStatus, DliProtos.completionStatus, DliProtos.resolvedfrom, DliProtos.typedIdentifier);
347
		final DNGFDecoder d = DNGFDecoder.decode(value, DliFieldTypeProtos.completionStatus,
348
				DliProtos.completionStatus, DliProtos.resolvedfrom, DliProtos.typedIdentifier,
349
				WdsDatasetProtos.WdsDataset.geolocation, WdsDatasetProtos.WdsDataset.otherRels, WdsPublicationProtos.WdsPublication.projects,
350
				WdsDatasetProtos.WdsDataset.projects, WDSFieldTypeProtos.identifierType,WDSFieldTypeProtos.identifierValue, WDSFieldTypeProtos.relationSemantic
351
		);
344 352
		return d.getDNGF();
345 353
	}
346 354

  

Also available in: Unified diff