Project

General

Profile

« Previous | Next » 

Revision 50646

Use misc-utils escaper: the one in velocity is too old and does not cover all XML entities!

View differences:

indexRecord.xml.vm
2 2

  
3 3
<!--
4 4
#macro(context $ctx)
5
        <$!ctx.elem id="$!esc.xml($!ctx.id)" label="$!esc.xml($contexts.get($!ctx.id))" #if($!ctx.isRoot()) type="community"#end>
5
        <$!ctx.elem id="$!esc.evaluate($!ctx.id)" label="$!esc.evaluate($contexts.get($!ctx.id))" #if($!ctx.isRoot()) type="community"#end>
6 6
	#foreach($child in $!ctx.children)#context($child)#end
7 7
        </$!ctx.elem>
8 8
#end
......
11 11
<record xmlns:dri="http://www.driver-repository.eu/namespace/dri" xmlns:oaf="http://namespace.openaire.eu/oaf">
12 12
	<result>
13 13
		<header>
14
			<dri:objIdentifier>$!esc.xml($!objIdentifier)</dri:objIdentifier>
15
			<dri:dateOfCollection>$!esc.xml($!dateOfCollection)</dri:dateOfCollection>
14
			<dri:objIdentifier>$!esc.evaluate($!objIdentifier)</dri:objIdentifier>
15
			<dri:dateOfCollection>$!esc.evaluate($!dateOfCollection)</dri:dateOfCollection>
16 16
			<dri:status>under curation</dri:status>
17 17
			<counters/>
18 18
		</header>
......
20 20
			<oaf:entity schemaLocation="http://namespace.openaire.eu/oaf $!oafSchemaLocation">
21 21
				<oaf:result>
22 22
					<title classid="main title" classname="main title" schemeid="dnet:dataCite_title" schemename="dnet:dataCite_title">
23
						$!esc.xml($!pub.title)
23
						$!esc.evaluate($!pub.title)
24 24
					</title>
25 25
					<dateofacceptance/>
26
					<resulttype classid="$!esc.xml($!pub.type)" classname="$!esc.xml($!resultTypes.get($!pub.type))" schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
27
					<language classid="$!esc.xml($!pub.language)" classname="$!esc.xml($!languages.get($!pub.language))" schemeid="dnet:languages"
26
					<resulttype classid="$!esc.evaluate($!pub.type)" classname="$!esc.evaluate($!resultTypes.get($!pub.type))" schemeid="dnet:result_typologies" schemename="dnet:result_typologies"/>
27
					<language classid="$!esc.evaluate($!pub.language)" classname="$!esc.evaluate($!languages.get($!pub.language))" schemeid="dnet:languages"
28 28
					          schemename="dnet:languages"/>
29 29
					<description>
30
						$!esc.xml($!pub.description)
30
						$!esc.evaluate($!pub.description)
31 31
					</description>
32 32
					<country classid="" classname="" schemeid="" schemename=""/>
33 33
					<subject classid="" classname="" schemeid="" schemename=""/>
34 34
					<relevantdate classid="" classname="" schemeid="" schemename=""/>
35
					<publisher>$!esc.xml($!pub.publisher)</publisher>
36
					<embargoenddate>$!esc.xml($!pub.embargoEndDate)</embargoenddate>
35
					<publisher>$!esc.evaluate($!pub.publisher)</publisher>
36
					<embargoenddate>$!esc.evaluate($!pub.embargoEndDate)</embargoenddate>
37 37
					<source/>
38 38
					<fulltext/>
39 39
					<format/>
......
44 44
					<version/>
45 45
					<lastmetadataupdate/>
46 46
					<metadataversionnumber/>
47
					<originalId>$!esc.xml($!pub.originalId)</originalId>
48
					<collectedfrom name="$!esc.xml($!collectedFrom.name)" id="$!esc.xml($!collectedFrom.calculateOpenaireId())"/>
47
					<originalId>$!esc.evaluate($!pub.originalId)</originalId>
48
					<collectedfrom name="$!esc.evaluate($!collectedFrom.name)" id="$!esc.evaluate($!collectedFrom.calculateOpenaireId())"/>
49 49

  
50 50
					#foreach($pid in $!pub.pids)
51
						<pid classid="$!esc.xml($!pid.type)" classname="$!esc.xml($!pidTypes.get($!pid.type))" schemeid="dnet:pid_types"
52
						     schemename="dnet:pid_types">$!esc.xml($pid.value)</pid>
51
						<pid classid="$!esc.evaluate($!pid.type)" classname="$!esc.evaluate($!pidTypes.get($!pid.type))" schemeid="dnet:pid_types"
52
						     schemename="dnet:pid_types">$!esc.evaluate($pid.value)</pid>
53 53
					#end
54 54

  
55
					<bestlicense classid="$!esc.xml($!pub.licenseCode)" classname="$!esc.xml($!licenses.get($!pub.licenseCode))"
55
					<bestlicense classid="$!esc.evaluate($!pub.licenseCode)" classname="$!esc.evaluate($!licenses.get($!pub.licenseCode))"
56 56
					             schemeid="dnet:access_modes" schemename="dnet:access_modes"/>
57 57

  
58 58
					#foreach($ctx in $util.processContexts($!pub.contexts))
......
79 79

  
80 80
							#set( $info = $!util.calculateProjectInfo($!link) )
81 81
							<rel inferred="false" trust="0.9" inferenceprovenance="" provenanceaction="user:claim:search">
82
								<to class="isProducedBy" scheme="dnet:result_project_relations" type="project">$!esc.xml($!info.id)</to>
83
								<code>$!esc.xml($!info.code)</code>
84
								<acronym>$!esc.xml($!info.acronym)</acronym>
85
								<title>$!esc.xml($!info.title)</title>
82
								<to class="isProducedBy" scheme="dnet:result_project_relations" type="project">$!esc.evaluate($!info.id)</to>
83
								<code>$!esc.evaluate($!info.code)</code>
84
								<acronym>$!esc.evaluate($!info.acronym)</acronym>
85
								<title>$!esc.evaluate($!info.title)</title>
86 86
								<contracttype classid="" classname="" schemeid="" schemename=""/>
87 87

  
88 88
								<funding>
89
									<funder id="$!esc.xml($!info.funderId)"
90
									        shortname="$!esc.xml($!info.funderShortName)"
91
									        name="$!esc.xml($!info.funderName)"
92
									        jurisdiction="$!esc.xml($!info.jurisdiction)"/>
93
									<funding_level_0 name="$!esc.xml($!info.fundingName)">$!esc.xml($!info.fundingId)</funding_level_0>
89
									<funder id="$!esc.evaluate($!info.funderId)"
90
									        shortname="$!esc.evaluate($!info.funderShortName)"
91
									        name="$!esc.evaluate($!info.funderName)"
92
									        jurisdiction="$!esc.evaluate($!info.jurisdiction)"/>
93
									<funding_level_0 name="$!esc.evaluate($!info.fundingName)">$!esc.evaluate($!info.fundingId)</funding_level_0>
94 94
								</funding>
95 95
							</rel>
96 96
						#end
97 97

  
98 98
					</rels>
99 99
					<children>
100
						<instance id="$!esc.xml($!objIdentifier)">
100
						<instance id="$!esc.evaluate($!objIdentifier)">
101 101

  
102
							<licence classid="$!esc.xml($!pub.licenseCode)" classname="$!esc.xml($licenses.get($!pub.licenseCode))"
102
							<licence classid="$!esc.evaluate($!pub.licenseCode)" classname="$!esc.evaluate($licenses.get($!pub.licenseCode))"
103 103
							         schemeid="dnet:access_modes" schemename="dnet:access_modes"/>
104 104

  
105
							<instancetype classid="$!esc.xml($!pub.resourceType)" classname="$!esc.xml($resourceTypes.get($!pub.resourceType))"
105
							<instancetype classid="$!esc.evaluate($!pub.resourceType)" classname="$!esc.evaluate($resourceTypes.get($!pub.resourceType))"
106 106
							              schemeid="dnet:publication_resource" schemename="dnet:publication_resource"/>
107
							<hostedby name="$!esc.xml($!hostedBy.name)" id="$!esc.xml($!hostedBy.calculateOpenaireId())"/>
107
							<hostedby name="$!esc.evaluate($!hostedBy.name)" id="$!esc.evaluate($!hostedBy.calculateOpenaireId())"/>
108 108
							<webresource>
109
								<url>$!esc.xml($!pub.url)</url>
109
								<url>$!esc.evaluate($!pub.url)</url>
110 110
							</webresource>
111 111
						</instance>
112 112
					</children>

Also available in: Unified diff