Project

General

Profile

« Previous | Next » 

Revision 48302

Added by Tsampikos Livisianos almost 7 years ago

move changes from dnet4

View differences:

Serializer.java
14 14
import eu.dnetlib.data.proto.OafProtos.OafEntity;
15 15
import eu.dnetlib.data.proto.OafProtos.OafRel;
16 16
import eu.dnetlib.data.proto.OrganizationProtos.Organization;
17
import eu.dnetlib.data.proto.PersonProtos;
17
//import eu.dnetlib.data.proto.PersonProtos;
18 18
import eu.dnetlib.data.proto.ProjectProtos.Project;
19 19
import eu.dnetlib.data.proto.RelTypeProtos.RelType;
20 20
import eu.dnetlib.data.proto.ResultProtos.Result;
......
61 61
                    case result:
62 62

  
63 63
                        return buildResult(oaf, DELIM, ENCLOSING);
64
                    /*
64 65
                    case person:
65 66
                        return buildPerson(oaf, DELIM, ENCLOSING);
67
                    */
66 68
                    default:
67 69
                        break;
68 70
                }
......
452 454

  
453 455
        for (OafRel rel : oaf.getEntity().getCachedRelList()) {
454 456

  
457
            /*
455 458
            if (rel.getRelType().equals(RelType.personResult)) {
456 459

  
457 460
                authors++;
458
            } else if (rel.getRelType().equals(RelType.resultProject))
461
            } else
462
            */
463
            if (rel.getRelType().equals(RelType.resultProject))
459 464
            // TODO remember : in result Project, first id is project, second is
460 465
            // result.
461 466
            {
......
644 649

  
645 650
    }
646 651

  
652
    /*
647 653
    private static String buildPerson(Oaf oaf, String DELIM, String ENCLOSING) {
648 654
        StringBuilder buff = new StringBuilder();
649 655

  
......
691 697
        return buff.toString();
692 698

  
693 699
    }
700
    */
694 701

  
695 702

  
696 703
    private static String getYearDifferenceInteger(String enddate, String startdate, String DELIM, String ENCLOSING) {

Also available in: Unified diff