Project

General

Profile

« Previous | Next » 

Revision 38198

#1413: escaping / in FundingProgram

View differences:

modules/cnr-openaire-exporter/branches/4.x.x/src/test/java/eu/dnetlib/openaire/exporter/EPrintsTest.java
13 13

  
14 14
public class EPrintsTest {
15 15

  
16
	private String inputXML = "<projects><project><FIELD name=\"jurisdiction\">JUR</FIELD><FIELD name=\"funder\">funderID</FIELD><FIELD name=\"grant_agreement_number\">GRANTID1</FIELD><FIELD name=\"title\">Project title 1</FIELD><FIELD name=\"acronym\">ACRO1</FIELD></project><project><FIELD name=\"grant_agreement_number\">GRANTID2</FIELD><FIELD name=\"title\">Project title 2</FIELD><FIELD name=\"funder\">funderID2</FIELD><FIELD name=\"acronym\">ACRO 2</FIELD></project></projects>";
17 16
	private Resource wtProject = new ClassPathResource("eu/dnetlib/openaire/exporter/WT-project.xml");
18 17
	private Resource fctProject = new ClassPathResource("eu/dnetlib/openaire/exporter/FCT-project.xml");
19 18
	private Resource fp7Project = new ClassPathResource("eu/dnetlib/openaire/exporter/FP7-project.xml");
......
26 25
	}
27 26

  
28 27
	@Test
29
	public void test() {
30
		ApplyXslt applyXslt = new ApplyXslt(ePrintsXslt);
31
		String result = applyXslt.evaluate(inputXML);
32
		System.out.println(result);
33
		assertTab(result);
34
	}
35

  
36
	@Test
37 28
	public void testWTePrints() throws IOException {
38 29
		ApplyXslt applyXslt = new ApplyXslt(ePrintsXslt);
39 30
		StringWriter w = new StringWriter();
modules/cnr-openaire-exporter/branches/4.x.x/src/test/resources/eu/dnetlib/openaire/exporter/FCT-project.xml
4 4
	<FIELD name="end_date">2003-10-31</FIELD>
5 5
	<FIELD name="grant_agreement_number">32639</FIELD>
6 6
	<FIELD name="title">Neural Network Controllers for Pneumatic Actuators</FIELD>
7
	<FIELD name="fundingprogramme">POCI</FIELD>
7
	<FIELD name="fundingprogramme">Orçamento de Funcionamento/POSC</FIELD>
8 8
	<FIELD name="acronym">POCTI/EME/32639/2000</FIELD>
9 9
	<FIELD name="start_date">2000-11-01</FIELD>
10 10
	<FIELD name="jurisdiction">PT</FIELD>
modules/cnr-openaire-exporter/branches/4.x.x/src/main/resources/eu/dnetlib/openaire/exporter/xslt/projects_dspace.xslt
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
2
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exclude-result-prefixes="xsl xsi">
4 4

  
5 5
	<xsl:output omit-xml-declaration="yes" standalone="omit" indent="yes"/>
......
10 10
		<xsl:variable name="title" select="//FIELD[@name='title']" />
11 11
		<xsl:variable name="acronym" select="//FIELD[@name='acronym']" />
12 12
		<xsl:variable name="funder" select="//FIELD[@name='funder']" />
13
		<xsl:variable name="fundingProgramme" select="//FIELD[@name='fundingprogramme']" />
13
		<xsl:variable name="fundingProgramme" select="replace(//FIELD[@name='fundingprogramme'], '/', '%2F')"/>
14 14
		<xsl:variable name="idnamespace">
15 15
		<!-- info:eu-repo/grantAgreement/Funder/FundingProgram/ProjectID /[Jurisdiction]/[ProjectName]/[ProjectAcronym]  -->
16 16
			<xsl:choose>
modules/cnr-openaire-exporter/branches/4.x.x/src/main/resources/eu/dnetlib/openaire/exporter/xslt/projects_eprints.xslt
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
2
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exclude-result-prefixes="xsl xsi">
4 4

  
5 5
<!-- DO NOT REINDENT THIS FILE: IT IS IMPORTANT THAT EACH PROJECT IS ON ONE SINGLE LINE -->
......
11 11
		<xsl:variable name="title" select="//FIELD[@name='title']" />
12 12
		<xsl:variable name="acronym" select="//FIELD[@name='acronym']" />
13 13
		<xsl:variable name="funder" select="//FIELD[@name='funder']" />
14
		<xsl:variable name="fundingProgramme" select="//FIELD[@name='fundingprogramme']" />
14
		<xsl:variable name="fundingProgramme" select="replace(//FIELD[@name='fundingprogramme'], '/', '%2F')"/>
15 15
		<xsl:variable name="idnamespace">
16 16
		<!-- info:eu-repo/grantAgreement/Funder/FundingProgram/ProjectID /[Jurisdiction]/[ProjectName]/[ProjectAcronym]  -->
17 17
			<xsl:choose>

Also available in: Unified diff