Project

General

Profile

« Previous | Next » 

Revision 48957

normalise spaces when extract project contact info

View differences:

modules/dnet-openaireplus-workflows/trunk/src/main/resources/eu/dnetlib/msro/openaireplus/workflows/repo-hi/xslt/corda_2_db.xsl
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3
>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4 3

  
5 4
	<xsl:param name="parentDatasourceId"/>
6 5

  
......
138 137
							<FIELD name="optional2">
139 138
								<xsl:value-of select="./ProjectCallWebpageUrl"/>
140 139
							</FIELD>
141
							<xsl:variable name="personSurname" select="./CoordinatorContactPerson/PersonLastName"/>
142
							<xsl:variable name="personFirstName" select="./CoordinatorContactPerson/PersonFirstName"/>
140
							<xsl:variable name="personSurname" select="normalize-space(./CoordinatorContactPerson/PersonLastName)"/>
141
							<xsl:variable name="personFirstName" select="normalize-space(./CoordinatorContactPerson/PersonFirstName)"/>
143 142
							<xsl:variable name="contactfullname">
144 143
								<xsl:choose>
145 144
									<xsl:when test="string-length($personFirstName) &gt; 0 and string-length($personSurname) &gt; 0">
146 145
										<xsl:value-of select="normalize-space(concat($personSurname, ', ', $personFirstName))"/>
147 146
									</xsl:when>
148 147
									<xsl:when test="string-length($personFirstName) &gt; 0">
149
										<xsl:value-of select="normalize-space($personFirstName)"/>
148
										<xsl:value-of select="$personFirstName"/>
150 149
									</xsl:when>
151 150
									<xsl:when test="string-length($personSurname) &gt; 0">
152
										<xsl:value-of select="normalize-space($personSurname)"/>
151
										<xsl:value-of select="$personSurname"/>
153 152
									</xsl:when>
154 153
									<xsl:otherwise>
155 154
										<xsl:value-of select="''"/>
modules/dnet-openaireplus-workflows/trunk/src/main/resources/eu/dnetlib/msro/openaireplus/workflows/repo-hi/xslt/corda_h2020_2_db.xsl
72 72
							<FIELD name="optional2">
73 73
								<xsl:value-of select="./ProjectTopicDescr"/>
74 74
							</FIELD>
75
							<xsl:variable name="personSurname" select="./CoordinatorContactPerson/PersonLastName"/>
76
							<xsl:variable name="personFirstName" select="./CoordinatorContactPerson/PersonFirstName"/>
75
							<xsl:variable name="personSurname" select="normalize-space(./CoordinatorContactPerson/PersonLastName)"/>
76
							<xsl:variable name="personFirstName" select="normalize-space(./CoordinatorContactPerson/PersonFirstName)"/>
77 77
							<xsl:variable name="contactfullname">
78 78
								<xsl:choose>
79 79
									<xsl:when test="string-length($personFirstName) &gt; 0 and string-length($personSurname) &gt; 0">
80 80
										<xsl:value-of select="normalize-space(concat($personSurname, ', ', $personFirstName))"/>
81 81
									</xsl:when>
82 82
									<xsl:when test="string-length($personFirstName) &gt; 0">
83
										<xsl:value-of select="normalize-space($personFirstName)"/>
83
										<xsl:value-of select="$personFirstName"/>
84 84
									</xsl:when>
85 85
									<xsl:when test="string-length($personSurname) &gt; 0">
86
										<xsl:value-of select="normalize-space($personSurname)"/>
86
										<xsl:value-of select="$personSurname"/>
87 87
									</xsl:when>
88 88
									<xsl:otherwise>
89 89
										<xsl:value-of select="''"/>
modules/dnet-openaireplus-workflows/trunk/src/main/resources/eu/dnetlib/msro/openaireplus/workflows/repo-hi/xslt/corda_h2020_substreams_2_db.xsl
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3
>
2
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4 3

  
5 4
	<xsl:param name="parentDatasourceId"/>
6 5

  
......
16 15
	<xsl:variable name="funderID" select="concat($namespacePrefix, '::EC')"/>
17 16

  
18 17
	<xsl:template match="/">
19
		<record
20
		>
18
		<record>
21 19

  
22 20
			<xsl:copy-of select=".//*[local-name()='header']"/>
23 21

  
......
90 88
							<FIELD name="optional2">
91 89
								<xsl:value-of select="./ProjectTopicDescr"/>
92 90
							</FIELD>
93
							<xsl:variable name="personSurname" select="./CoordinatorContactPerson/PersonLastName"/>
94
							<xsl:variable name="personFirstName" select="./CoordinatorContactPerson/PersonFirstName"/>
91
							<xsl:variable name="personSurname" select="normalize-space(./CoordinatorContactPerson/PersonLastName)"/>
92
							<xsl:variable name="personFirstName" select="normalize-space(./CoordinatorContactPerson/PersonFirstName)"/>
95 93
							<xsl:variable name="contactfullname">
96 94
								<xsl:choose>
97 95
									<xsl:when test="string-length($personFirstName) &gt; 0 and string-length($personSurname) &gt; 0">
98 96
										<xsl:value-of select="normalize-space(concat($personSurname, ', ', $personFirstName))"/>
99 97
									</xsl:when>
100 98
									<xsl:when test="string-length($personFirstName) &gt; 0">
101
										<xsl:value-of select="normalize-space($personFirstName)"/>
99
										<xsl:value-of select="$personFirstName"/>
102 100
									</xsl:when>
103 101
									<xsl:when test="string-length($personSurname) &gt; 0">
104
										<xsl:value-of select="normalize-space($personSurname)"/>
102
										<xsl:value-of select="$personSurname"/>
105 103
									</xsl:when>
106 104
									<xsl:otherwise>
107 105
										<xsl:value-of select="''"/>

Also available in: Unified diff