Project

General

Profile

« Previous | Next » 

Revision 40699

Added by Eri Katsari over 8 years ago

fixes for delims in funding parser; fix for relation name in relations file

View differences:

Serializer.java
35 35 
    private String NULL_NUM = "0";
36 36 

  		




  37
  37
  
    
    private static String ENCLOSED;


  		




  38
  
  
    
    private FundingParser fundingParser = new FundingParser();


  		




  
  38
  
    
    private FundingParser fundingParser;


  		




  39
  39
  
    

  		




  40
  40
  
    

  		




  41
  
  
    
    public Serializer() {


  		




  
  41
  
    
    public Serializer(String delim, String enclosing) {


  		




  
  42
  
    
        this.setDELIM(delim);


  		




  
  43
  
    
        this.setENCLOSED(enclosing);


  		




  
  44
  
    
        this.fundingParser = new FundingParser(delim, enclosing);


  		




  
  45
  
    

  		




  42
  46
  
    
    }


  		




  43
  47
  
    

  		




  44
  48
  
    
    public String serialize(Oaf oaf) {


  		




  ......




  112
  116
  
    
                relations.addAll(getDedups(valueEntity));


  		




  113
  117
  
    
                return relations;


  		




  114
  118
  
    
            default:


  		




  115
  
  
    
                return  relations;


  		




  
  119
  
    
                return relations;


  		




  116
  120
  
    
        }


  		




  117
  121
  
    

  		




  118
  122
  
    
    }


  		




  119
  123
  
    

  		




  120
  124
  
    
    private String buildRel(OafRel Rel) {


  		




  
  125
  
    
        return getStringField(Rel.getRelType().name()) + getStringField(Rel.getSource()) + getStringField(Rel.getTarget());


  		




  121
  126
  
    

  		




  122
  
  
    
        return getStringField(Rel.getRelType().getDescriptorForType().getFullName()) + getStringField(Rel.getRelType().getDescriptorForType().toString())


  		




  123
  
  
    
                + getStringField(Rel.getRelType().name())


  		




  124
  
  
    
                + getStringField(Rel.getSource()) + getStringField(Rel.getTarget());


  		




  125
  
  
    

  		




  126
  127
  
    
    }


  		




  127
  128
  
    

  		




  128
  129
  
    
    private String getResultResult(OafRel oaf) {


  		












Also available in:  Unified diff