Project

General

Profile

« Previous | Next » 

Revision 58150

set bestaccessright.classname to 'not avalable' when the classid is UNKNOWN

View differences:

modules/dnet-mapreduce-jobs/trunk/src/main/java/eu/dnetlib/data/mapreduce/hbase/dataexport/ProtoConverter.java
396 396

  
397 397
    private static Qualifier getBestAccessRights(List<ResultProtos.Result.Instance> instanceList) {
398 398
        if (instanceList != null) {
399
            final Qualifier bestaccessright = mapQualifier(instanceList.stream()
399
            final Qualifier rights = mapQualifier(instanceList.stream()
400 400
                    .map(i -> i.getAccessright())
401 401
                    .sorted(new LicenseComparator())
402 402
                    .findFirst()
403 403
                    .get());
404 404

  
405
            if (StringUtils.isBlank(bestaccessright.getClassid())) {
406
                bestaccessright.setClassid(UNKNOWN);
405
            if (StringUtils.isBlank(rights.getClassid())) {
406
                rights.setClassid(UNKNOWN);
407 407
            }
408
            if (StringUtils.isBlank(bestaccessright.getClassname())) {
409
                bestaccessright.setClassname(NOT_AVAILABLE);
408
            if (StringUtils.isBlank(rights.getClassname()) || UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
409
                rights.setClassname(NOT_AVAILABLE);
410 410
            }
411
            if (StringUtils.isBlank(bestaccessright.getSchemeid())) {
412
                bestaccessright.setSchemeid(DNET_ACCESS_MODES);
411
            if (StringUtils.isBlank(rights.getSchemeid())) {
412
                rights.setSchemeid(DNET_ACCESS_MODES);
413 413
            }
414
            if (StringUtils.isBlank(bestaccessright.getSchemename())) {
415
                bestaccessright.setSchemename(DNET_ACCESS_MODES);
414
            if (StringUtils.isBlank(rights.getSchemename())) {
415
                rights.setSchemename(DNET_ACCESS_MODES);
416 416
            }
417 417

  
418
            return bestaccessright;
418
            return rights;
419 419
        }
420 420
        return null;
421 421
    }

Also available in: Unified diff