Project

General

Profile

« Previous | Next » 

Revision 33431

Added by Alessia Bardi almost 10 years ago

Fixed regex to generate the grant id for FCT projects.

View differences:

modules/cnr-openaire-exporter/trunk/src/test/java/eu/dnetlib/openaire/exporter/ProjectsControllerTest.java
19 19 
	private ProjectQueryParams params;
20 20 
	private String expectedFP7Query = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^corda_______::'  , '') as grant_agreement_number, p.startdate as start_date, p.enddate as end_date, f1.name as subdivision, f2.name as specificprogramme, f3.name as fundingprogramme from projects p left outer join project_funding pf on (p.id = pf.project) left outer join funding_funding ff1 on (pf.funding = ff1.funding1) left outer join funding_funding ff2 on (ff1.funding2 = ff2.funding1) left outer join fundings f1 on (f1.id = ff1.funding1) left outer join fundings f2 on (f2.id = ff2.funding1) left outer join fundings f3 on (f3.id = ff2.funding2) where f3.id = 'corda_______::FP7' ";
21 21 
	private String expectedWTQuery = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^welcometrust::'  , '') as grant_agreement_number, p.startdate as start_date, p.enddate as end_date, f1.name as specificprogramme, f2.name as fundingprogramme from projects p left outer join project_funding pf on (p.id = pf.project) left outer join funding_funding ff1 on (pf.funding = ff1.funding1) left outer join fundings f1 on (f1.id = ff1.funding1)  left outer join fundings f2 on (f2.id = ff1.funding2) where f2.id = 'wt::WT' ";
22 
	private String expectedFCTQuery = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^fct'  , '') as grant_agreement_number,p.startdate as start_date, p.enddate as end_date, f1.name as specificprogramme, f2.name as fundingprogramme from projects p left outer join project_funding pf on (p.id = pf.project) left outer join funding_funding ff1 on (pf.funding = ff1.funding1) left outer join fundings f1 on (f1.id = ff1.funding1)  left outer join fundings f2 on (f2.id = ff1.funding2) where f2.id = 'fct_________::FCT' ";
22 
	private String expectedFCTQuery = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^fct_________::'  , '') as grant_agreement_number,p.startdate as start_date, p.enddate as end_date, f1.name as specificprogramme, f2.name as fundingprogramme from projects p left outer join project_funding pf on (p.id = pf.project) left outer join funding_funding ff1 on (pf.funding = ff1.funding1) left outer join fundings f1 on (f1.id = ff1.funding1)  left outer join fundings f2 on (f2.id = ff1.funding2) where f2.id = 'fct_________::FCT' ";
23 23 

  		




  24
  24
  
    
	private Resource wtProject = new ClassPathResource("eu/dnetlib/openaire/exporter/WT-project.xml");


  		




  25
  25
  
    
	private Resource eprintsXSLT = new ClassPathResource("eu/dnetlib/openaire/exporter/xslt/projects_eprints.xslt");


  		












  

    
      modules/cnr-openaire-exporter/trunk/src/main/java/eu/dnetlib/openaire/exporter/ProjectsController.java
    
  





  165
  165
  
    
	 * @return the query string


  		




  166
  166
  
    
	 */


  		




  167
  167
  
    
	protected String obtainFCTQuery(final ProjectQueryParams params) {


  		




  168
  
  
    
		String query = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^fct'  , '') as grant_agreement_number,"


  		




  
  168
  
    
		String query = "select p.acronym as acronym, p.title as title, regexp_replace(p.id, '^fct_________::'  , '') as grant_agreement_number,"


  		




  169
  169
  
    
				+ "p.startdate as start_date, p.enddate as end_date, f1.name as specificprogramme, f2.name as fundingprogramme "


  		




  170
  170
  
    
				+ "from projects p left outer join project_funding pf on (p.id = pf.project) "


  		




  171
  171
  
    
				+ "left outer join funding_funding ff1 on (pf.funding = ff1.funding1) "


  		












Also available in:  Unified diff