Project

General

Profile

« Previous | Next » 

Revision 50032

fixed scholix version and Date mapping

View differences:

DNGFDLISummaryConverter.java
8 8
import eu.dnetlib.data.proto.DliFieldTypeProtos;
9 9
import eu.dnetlib.data.proto.DliProtos;
10 10
import eu.dnetlib.data.proto.dli.DLIObjectProtos;
11
import org.apache.commons.lang3.StringUtils;
11 12

  
12 13
import static eu.dnetlib.data.proto.dli.DLIObjectProtos.DLIObjectSummary;
13 14
import static eu.dnetlib.data.proto.dli.DLIObjectProtos.TypedIdentifier;
......
226 227
    }
227 228

  
228 229
    private void managePublicationDates(final PublicationProtos.Publication publication, final DLIObjectSummary.Builder metadata) {
229
        if (publication.getMetadata().getDateofacceptance() != null) {
230
        if (publication.getMetadata().getDateofacceptance() != null && StringUtils.isNotEmpty(publication.getMetadata().getDateofacceptance().toString())) {
230 231
            metadata.addDate(publication.getMetadata().getDateofacceptance().getValue());
231 232
        }
232 233

  
233
        if (publication.getMetadata().getRelevantdateList() != null && !publication.getMetadata().getRelevantdateList().isEmpty()) {
234
            publication.getMetadata().getRelevantdateList().forEach(
235
                    date -> metadata.addDate(date.getValue())
236
            );
237
        }
234
//        if (publication.getMetadata().getRelevantdateList() != null && !publication.getMetadata().getRelevantdateList().isEmpty()) {
235
//            publication.getMetadata().getRelevantdateList().forEach(
236
//                    date -> metadata.addDate(date.getValue())
237
//            );
238
//        }
238 239
    }
239 240

  
240 241
    private void manageDatasetDates(final DatasetProtos.Dataset dataset, final DLIObjectSummary.Builder metadata) {
241
        if (dataset.getMetadata().getDateofacceptance() != null) {
242
        if (dataset.getMetadata().getDateofacceptance() != null && StringUtils.isNotEmpty(dataset.getMetadata().getDateofacceptance().toString())) {
242 243
            metadata.addDate(dataset.getMetadata().getDateofacceptance().getValue());
243 244
        }
244 245

  
245 246
        if (dataset.getMetadata().getRelevantdateList() != null && !dataset.getMetadata().getRelevantdateList().isEmpty()) {
246 247
            dataset.getMetadata().getRelevantdateList().forEach(
247
                    date -> metadata.addDate(date.getValue())
248
                    date -> {
249
                        if (date.getValue()!= null && StringUtils.isNotEmpty(date.getValue()))
250
                            metadata.addDate(date.getValue());
251
                    }
248 252
            );
249 253
        }
250 254

  

Also available in: Unified diff