Project

General

Profile

« Previous | Next » 

Revision 47505

Added by Argiro Kokogiannaki almost 7 years ago

change record path to relative | change semantics for projects and contexts | for migration fetch claims ordered by id

View differences:

modules/uoa-claims -demo/claims-demo/src/main/java/eu/dnetlib/data/claims/migration/handler/ResultHandler.java
31 31 
            String path=createExportPath(result.getResultType(),result.getCollectedFrom(),result.getOpenaireId());
32 32 
            try {
33 33 
                //TODO check what should be saved in the path field
34 
                FileUtils.writeStringToFile(new File(path), result.getMetadataRecord());
34 
                FileUtils.writeStringToFile(new File(this.pathToSaveRecord+path), result.getMetadataRecord());
35 35 
                return path;
36 36 
            } catch (IOException e) {
37 37 
                log.error("Couldn't write record to file "+ path,e);
......
52 52 
        }
53 53 
        //TODO fix this openaireId.replace("/","*") ?? url encode
54 54 
        //temporary solution for external results with doi which contain "/" (It creates folders in path)
55 
        return this.pathToSaveRecord+""+type+"/"+datasource+"/"+openaireId.replace("/","*");
55 
        return type+"/"+datasource+"/"+openaireId.replace("/","*");
56 56 

  		




  57
  57
  
    
    }


  		




  58
  58
  
    
    public SqlDAO getSqlDAO() {


  		












  

    
      modules/uoa-claims -demo/claims-demo/src/main/java/eu/dnetlib/data/claimsDemo/QueryGenerator.java
    
  





  287
  287
  
    
            semantics="resultResult_"+targetType+sourceType+"_isRelatedTo";


  		




  288
  288
  
    
        }


  		




  289
  289
  
    
        else if((targetType.equals(ClaimUtils.PUBLICATION)||targetType.equals(ClaimUtils.DATASET))&&(sourceType.equals(ClaimUtils.PROJECT))){


  		




  290
  
  
    
            semantics="resultProject_outcome_isProducedBy";


  		




  
  290
  
    
            semantics= "resultProject_outcome_produces";  //"resultProject_outcome_isProducedBy";


  		




  291
  291
  
    
        }


  		




  
  292
  
    
        else if((targetType.equals(ClaimUtils.PUBLICATION)||targetType.equals(ClaimUtils.DATASET))&&(sourceType.equals(ClaimUtils.CONTEXT))){


  		




  
  293
  
    
            semantics= "isRelevantTo";


  		




  
  294
  
    
        }


  		




  292
  295
  
    

  		




  293
  
  
    

  		




  294
  296
  
    
        return semantics;


  		




  295
  297
  
    
    }


  		




  296
  298
  
    
   /* public  String generateInsertClaimResultQuery(Result targetResult, Result sourceResult, Claim claim) {


  		




  ......




  456
  458
  
    
     */


  		




  457
  459
  
    
    public String generateSelectRelationEnrichedWithDMFClaimsQuery(Integer limit) {


  		




  458
  460
  
    
        return " select rel.*, dmf.dmf from (Select * from "+this.migrationTable+"  where type='rels2actions' order by id) as rel left outer join \n" +


  		




  459
  
  
    
                        "(Select DISTINCT ON (resultid) resultid,date, xml as dmf from "+this.migrationTable+"  where type='dmf2actions' and xml NOT ILIKE '%<oaf:concept%'   order by resultid,date desc , xml) as dmf on rel.resultid=dmf.resultid"


  		




  
  461
  
    
                        "(Select DISTINCT ON (resultid) resultid,date, xml as dmf from "+this.migrationTable+"  where type='dmf2actions' and xml NOT ILIKE '%<oaf:concept%'   order by resultid,date desc , xml) as dmf on rel.resultid=dmf.resultid "+


  		




  
  462
  
    
                " order by rel.id "


  		




  460
  463
  
    
                +(limit>0?" limit "+limit:"");


  		




  461
  464
  
    

  		




  462
  465
  
    
    }


  		




  ......




  469
  472
  
    
    public String generateSelectConceptClaimsEnrichedWithDMFClaimsQuery(Integer limit) {


  		




  470
  473
  
    
        return " select rel.*, dmf.dmf from (Select * from "+this.migrationTable+"  where  ( type='dmf2actions' or type='updates2actions' ) and xml LIKE '%<oaf:concept%' order by id) as rel left outer join \n" +


  		




  471
  474
  
    
                "(Select DISTINCT ON (resultid) resultid,date, xml as dmf from "+this.migrationTable+"  where type='dmf2actions' and xml NOT ILIKE '%<oaf:concept%'   order by resultid,date desc , xml) as dmf on rel.resultid=dmf.resultid"


  		




  
  475
  
    
                +" order by rel.id "


  		




  472
  476
  
    
                +(limit>0?" limit "+limit:"");


  		




  473
  477
  
    

  		




  474
  478
  
    
    }


  		












Also available in:  Unified diff