Project

General

Profile

« Previous | Next » 

Revision 58637

implemented changes described in changeset for 1.0

View differences:

modules/dnet-openaire-schema/trunk/schema/1.0/changeset.txt
1
Changes from version 0.3
2

  
3
oaf-result-0.4.xsd
4

  
5
- Added contributor (all)
6
- Added instance collectedfrom (all)
7
- Added instance dateofacceptance (all)
8
- Added attributes of the journal element:
9
    - iss: issue
10
	- vol: volume
11
	- sp: start page
12
	- ep: end page
13
- Added documentationUrl (sw)
14
- Added codeRepositoryUrl (sw)
15
- Added programmingLanguage (sw)
16
- added type (orp + sw)
17

  
18
oaf-common-0.4.xsd:
19
- Added openairecompatibility field in links to datasources
20

  
21
oaf-project-0.4.xsd:
22
- Element 'class' of the project funding tree is now optional
23
- funding hierarchy (i.e. 'funding_level_X' elements) is now optional: fundingtree may only refer to the funder.
24

  
25 1
Changes from version 0.4
26 2

  
27 3
Major changes:
......
39 15
Minor changes
40 16
oaf-common-1.0.xsd
41 17
- Added following elements in related results: collectedfrom, url, pid
42
- Added provenanceaction attribute to elements of type optionalClassedSchemedElement (e.g. subject)
18
- some types renamed 
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-project-1.0.xsd
22 22
						<xs:documentation> Identifier of the call for proposal.</xs:documentation>
23 23
					</xs:annotation>
24 24
				</xs:element>
25
				<xs:element name="contracttype" type="controlledElementType"/>
25
				<xs:element name="contactfullname" type="xs:string"/>
26
				<xs:element name="contactfax" type="xs:string"/>
27
				<xs:element name="contactphone" type="xs:string"/>
28
				<xs:element name="contactemail" type="xs:string"/>
29
				<xs:element name="contracttype" type="qualifierType"/>
26 30
				<xs:element name="keywords" type="xs:string"/>
27 31
				<xs:element name="websiteurl" type="xs:string"/>
28 32
				<xs:element name="startdate" type="xs:string"/>
......
44 48
						<xs:documentation>True if the project is under the EC Open Data Pilot. Available only for EC H2020 funded projects. </xs:documentation>
45 49
					</xs:annotation>
46 50
				</xs:element>
47
				<xs:element name="subjects" type="typedElementType"/>
51
				<xs:element name="subjects" type="qualifierType"/>
48 52
					
49 53
				<xs:element name="fundingtree" type="fundingTreeType"/>
50 54
				<xs:element name="originalId" type="xs:string"/>
......
54 58
							project has been collected from. </xs:documentation>
55 59
					</xs:annotation>
56 60
				</xs:element>
57
				<xs:element name="pid" type="typedElementType"/>
61
				<xs:element name="pid" type="qualifierType"/>
58 62
				<xs:element name="rels" type="relsType">
59 63
					<xs:annotation>
60 64
						<xs:documentation>Relationships to other entities. </xs:documentation>
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-org-1.0.xsd
15 15
				<xs:element name="logourl" type="xs:string"/>
16 16
				<xs:element name="originalId" type="xs:string"/>
17 17
				<xs:element name="websiteurl" type="xs:string"/>
18
				<xs:element name="country" type="controlledElementType">
18
				<xs:element name="country" type="qualifierType">
19 19
					<xs:annotation>
20 20
						<xs:documentation>Countries in ISO 3166-1 alpha-2. </xs:documentation>
21 21
					</xs:annotation>
......
27 27
							organization has been collected from. </xs:documentation>
28 28
					</xs:annotation>
29 29
				</xs:element>
30
				<xs:element name="pid" type="typedElementType"/>
30
				<xs:element name="pid" type="structuredPropertyElementType"/>
31 31
				<xs:element name="rels" type="relsType">
32 32
					<xs:annotation>
33 33
						<xs:documentation>Relationships to other entities. </xs:documentation>
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-common-1.0.xsd
19 19
	<xs:simpleType name="stringOrEmptyType">
20 20
		<xs:union memberTypes="emptyType xs:string"/>
21 21
	</xs:simpleType>
22

  
23
	<xs:complexType mixed="true" name="inferenceExtendedStringType">
24
		<xs:annotation>
25
			<xs:documentation>XML elements of this type are simple strings, but in cases where their
26
				values have been inferred by Openaire inference algorithms, the elements features
27
				some attributes describing the inference algorithm. This way it is easy to
28
				understand if a value comes from the originally imported data or if it has been
29
				added later for enrichment. </xs:documentation>
30
		</xs:annotation>
31
		<xs:simpleContent>
32
			<xs:extension base="xs:string">
33
				<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
34
			</xs:extension>
35
		</xs:simpleContent>
36
	</xs:complexType>
37

  
38
	<xs:complexType mixed="true" name="inferenceExtendedBooleanType">
39
		<xs:annotation>
40
			<xs:documentation>XML elements of this type are simple booleans, but in cases where
41
				their values have been inferred by Openaire inference algorithms, the elements
42
				features some attributes describing the inference algorithm. This way it is easy to
43
				understand if a value comes from the originally imported data or if it has been
44
				added later for enrichment. </xs:documentation>
45
		</xs:annotation>
46
		<xs:simpleContent>
47
			<xs:extension base="xs:boolean">
48
				<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
49
			</xs:extension>
50
		</xs:simpleContent>
51
	</xs:complexType>
52

  
53
	<xs:attributeGroup name="optionalInferenceAttrGroup">
22
	
23
	<xs:attributeGroup name="dataInfoAttributeGroup">
54 24
		<xs:attribute name="inferred" use="optional" type="xs:boolean">
55 25
			<xs:annotation>
56 26
				<xs:documentation>True if this information has been inferred by the automatic
57 27
					inference algorithms run by OpenAIRE. </xs:documentation>
58 28
			</xs:annotation>
59 29
		</xs:attribute>
60
		<xs:attribute name="inferenceprovenance" use="optional" type="xs:string">
61
			<xs:annotation>
62
				<xs:documentation>Which algorithm inferred the current property. </xs:documentation>
63
			</xs:annotation>
64
		</xs:attribute>
65 30
		<xs:attribute name="trust" use="optional" type="xs:string">
66 31
			<xs:annotation>
67 32
				<xs:documentation>Value of trust of this information in the range [0,1]. More the
68 33
					value, more trustworthy is the information. </xs:documentation>
69 34
			</xs:annotation>
70 35
		</xs:attribute>
36
		<xs:attribute name="inferenceprovenance" use="optional" type="xs:string">
37
			<xs:annotation>
38
				<xs:documentation>Which algorithm inferred the current property. </xs:documentation>
39
			</xs:annotation>
40
		</xs:attribute>
41
		<xs:attributeGroup ref="qualifierAttributeGroup"></xs:attributeGroup>
71 42
	</xs:attributeGroup>
72

  
73
	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
74

  
75
	<xs:complexType mixed="true" name="controlledElementType">
43
	
44
	<xs:attributeGroup name="qualifierAttributeGroup">
45
		<xs:attribute name="classid" use="required" type="xs:string"/>
46
		<xs:attribute name="classname" use="required" type="xs:string"/>
47
		<xs:attribute name="schemeid" use="required" type="xs:string"/>
48
		<xs:attribute name="schemename" use="required" type="xs:string"/>
49
	</xs:attributeGroup>
50
	
51
	<xs:complexType name="fieldType">
76 52
		<xs:simpleContent>
77 53
			<xs:extension base="xs:string">
78
				<xs:attribute name="code" use="required" type="xs:string"/>
79
				<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
54
				<xs:attributeGroup ref="dataInfoAttributeGroup"/>
80 55
			</xs:extension>
81 56
		</xs:simpleContent>
82 57
	</xs:complexType>
83

  
84
	<!--
85
	<xs:complexType mixed="true" name="optionalControlledElementType">
86
		<xs:attribute name="code" use="optional" type="xs:string"/>
87
		<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
58
	
59
	<xs:complexType name="qualifierType">
60
		<xs:attributeGroup ref="qualifierAttributeGroup"/>
88 61
	</xs:complexType>
89
	-->
90

  
91
	<xs:complexType name="namedIdElementType">
92
		<xs:attribute name="id" use="required"/>
93
		<xs:attribute name="name" use="required"/>
94
		<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
62
	
63
	<xs:complexType name="dataInfoType">
64
		<xs:attributeGroup ref="dataInfoAttributeGroup"/>
95 65
	</xs:complexType>
96

  
66
	
67
	<xs:complexType name="structuredPropertyElementType">
68
		<xs:simpleContent>
69
			<xs:extension base="xs:string">
70
				<xs:attributeGroup ref="qualifierAttributeGroup"/>
71
				<xs:attributeGroup ref="dataInfoAttributeGroup"/>
72
			</xs:extension>
73
		</xs:simpleContent>
74
	</xs:complexType>
75
	
97 76
	<xs:complexType name="labeledIdElementType">
98 77
		<xs:attribute name="id" use="required"/>
99 78
		<xs:attribute name="label" use="required"/>
100
		<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
101 79
	</xs:complexType>
102

  
103
	<xs:complexType name="typedElementType">
104
		<xs:simpleContent>
105
			<xs:extension base="xs:string">
106
				<xs:attribute name="type" use="required"/>
107
				<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
80
	
81
	<!-- <oaf:context id="egi" label="EGI" type="community">
82
            <oaf:category id="egi::virtual" label="EGI virtual organizations">
83
                <oaf:concept id="egi::virtual::2" label="alice"/>
84
            </oaf:category>
85
        </oaf:context>
86
         <oaf:community id="{@id}" label="{@label}">
87
            <xsl:apply-templates/>
88
        </oaf:community>
89
	-->
90
	<xs:complexType name="contextType">
91
		<xs:complexContent>
92
			<xs:extension base="labeledIdElementType">
93
				<xs:sequence maxOccurs="unbounded">
94
					<xs:element name="category" type="categoryType"/>
95
				</xs:sequence>
96
				<xs:attributeGroup ref="dataInfoAttributeGroup"/>
108 97
			</xs:extension>
109
		</xs:simpleContent>
110
		
98
		</xs:complexContent>
111 99
	</xs:complexType>
100
	
101
	<xs:complexType name="categoryType">
102
		<xs:complexContent>
103
			<xs:extension base="labeledIdElementType">
104
				<xs:sequence minOccurs="0" maxOccurs="unbounded">
105
					<xs:element name="concept" type="conceptType"/>
106
				</xs:sequence>
107
			</xs:extension>
108
		</xs:complexContent>
109
	</xs:complexType>
110
	
111
	<xs:complexType name="conceptType">
112
		<xs:complexContent>
113
			<xs:extension base="labeledIdElementType">
114
				<xs:sequence maxOccurs="unbounded" minOccurs="0">
115
					<xs:element name="concept" type="conceptType"/>
116
				</xs:sequence>
117
			</xs:extension>
118
		</xs:complexContent>
119
	</xs:complexType>
120
	
121
	<xs:complexType name="namedIdElementType">
122
		<xs:attribute name="id" use="required"/>
123
		<xs:attribute name="name" use="required"/>
124
		<xs:attributeGroup ref="dataInfoAttributeGroup"/>
125
	</xs:complexType>
112 126

  
113

  
114 127
	<xs:complexType name="relsType">
115 128
		<xs:annotation>
116 129
			<xs:documentation>Relationships to other entities.</xs:documentation>
......
127 140
				<xs:element name="title" type="xs:string"/>
128 141
				<xs:element name="websiteurl"/>
129 142
				<xs:choice>
130
					<xs:group ref="relPersonGroup"/>
131 143
					<xs:group ref="relDataSourceGroup"/>
132 144
					<xs:group ref="relResultGroup"/>
133 145
					<xs:group ref="relProjectGroup"/>
......
136 148
				</xs:choice>
137 149
			</xs:choice>
138 150
		</xs:sequence>
139
		<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
140
		<xs:attribute name="provenanceaction" type="xs:string"/>
151
		<xs:attributeGroup ref="dataInfoAttributeGroup"/>
141 152
	</xs:complexType>
142 153

  
143

  
144
	<xs:group name="relPersonGroup">
145
		<xs:sequence>
146
			<xs:choice minOccurs="0" maxOccurs="unbounded">
147
				<xs:element name="ranking" type="xs:integer"/>
148
				<xs:element name="fullname" type="xs:string"/>
149
				<xs:element name="fax" type="xs:string"/>
150
				<xs:element name="email" type="xs:string"/>
151
				<xs:element name="phone" type="xs:string"/>
152
			</xs:choice>
153
		</xs:sequence>
154
	</xs:group>
155

  
156 154
	<xs:group name="relDataSourceGroup">
157 155
		<xs:sequence>
158 156
			<xs:choice minOccurs="0" maxOccurs="unbounded">
159 157
				<xs:element name="officialname" type="xs:string"/>
160
				<xs:element name="datasourcetype" type="controlledElementType"/>
158
				<xs:element name="datasourcetype" type="qualifierType"/>
161 159
			</xs:choice>
162 160
		</xs:sequence>
163 161
	</xs:group>
......
165 163
	<xs:group name="relResultGroup">
166 164
		<xs:sequence>
167 165
			<xs:choice minOccurs="0" maxOccurs="unbounded">
166
				<xs:element name="collectedfrom" type="namedIdElementType"/>
167
				<xs:element name="url" type="xs:string"/>
168
				<xs:element name="pid" type="structuredPropertyElementType"/>
168 169
				<xs:element name="dateofacceptance" type="xs:string"/>
169 170
				<xs:element name="publisher" type="xs:string"/>
170 171
				<xs:element name="resulttype" type="xs:string">
......
212 213
	<xs:group name="fundingGroup">
213 214
		<xs:sequence>
214 215
			<xs:choice minOccurs="0" maxOccurs="unbounded">
215
				<xs:element name="contracttype" type="controlledElementType"/>
216
				<xs:element name="contracttype" type="qualifierType"/>
216 217
				<xs:element name="funding" type="fundingFlatType"/>
217 218
			</xs:choice>
218 219
		</xs:sequence>
......
223 224
			<xs:choice minOccurs="0" maxOccurs="unbounded">
224 225
				<xs:element name="legalname" type="xs:string"/>
225 226
				<xs:element name="legalshortname" type="xs:string"/>
226
				<xs:element name="country" type="controlledElementType"/>
227
				<xs:element name="country" type="xs:string"/>
227 228
			</xs:choice>
228 229
		</xs:sequence>
229 230
	</xs:group>
......
233 234
		<xs:annotation>
234 235
			<xs:documentation>Information about the related entity. <p>The semantics of the
235 236
					relationships is expressed by the attributes class and scheme. </p>
236
				<!--  <p>See the following ontology for the available relationships: $ontologyURL$</p>-->
237
				<p>Allowed relationships are: <table>
238
						<tr><th>Entity types</th><th>Name of relationships</th><th>Inverse
239
								of</th><th>Simmetric</th></tr>
240
						<tr><td>Project --
241
								Person</td><td>hasContact</td><td>isContact</td><td>no</td></tr>
242
						<tr><td>Project --
243
								Result</td><td>produces</td><td>isProducedBy</td><td>no</td></tr>
244
						<tr><td>Project --
245
								Organization</td><td>hasParticipant</td><td>isParticipant</td><td>no</td></tr>
246
						<tr><td>Person --
247
								Project</td><td>isContact</td><td>hasContact</td><td>no</td></tr>
248
						<tr><td>Person --
249
								Result</td><td>isAuthorOf</td><td>hasAuthor</td><td>no</td></tr>
250
						<tr><td>Person --
251
							Person</td><td>isCoauthorOf</td><td>--</td><td>yes</td></tr>
252
						<tr><td>Result --
253
								Person</td><td>hasAuthor</td><td>isAuthorOf</td><td>no</td></tr>
254
						<tr><td>Result --
255
								Project</td><td>isProducedBy</td><td>produces</td><td>no</td></tr>
256
						<tr><td>Result --
257
							Result</td><td>isRelatedTo</td><td>--</td><td>yes</td></tr>
258
						<tr><td>Result --
259
								Result</td><td>hasAmongTopNSimilarDocuments</td><td>isAmongTopNSimilarDocuments</td><td>no</td></tr>
260
						<tr><td>Result --
261
								Result</td><td>isAmongTopNSimilarDocuments</td><td>hasAmongTopNSimilarDocuments</td><td>no</td></tr>
262
						<tr><td>Organization --
263
								Datasource</td><td>isProvidedBy</td><td>provides</td><td>no</td></tr>
264
						<tr><td>Organization --
265
								Project</td><td>isParticpant</td><td>hasParticipant</td><td>no</td></tr>
266
						<tr><td>Datasource --
267
								Organization</td><td>provides</td><td>isProvidedBy</td><td>no</td></tr>
268
					</table></p>
269 237
			</xs:documentation>
270 238
		</xs:annotation>
271 239
		<xs:simpleContent>
......
318 286
			<xs:element name="sitename" type="xs:string" minOccurs="0" maxOccurs="1"/>
319 287
			<!--<xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>-->
320 288
			<xs:element name="url" type="xs:string" minOccurs="0" maxOccurs="1"/>
321
			<xs:element name="qualifier" type="controlledElementType" minOccurs="0" maxOccurs="1"/>
289
			<xs:element name="qualifier" type="qualifierType" minOccurs="0" maxOccurs="1"/>
322 290
			<xs:element name="refidentifier" type="xs:string" minOccurs="0" maxOccurs="1"/>
323 291
		</xs:sequence>
324
		<xs:attributeGroup ref="optionalInferenceAttrGroup"/>
292
		<xs:attributeGroup ref="dataInfoAttributeGroup"/>
325 293
	</xs:complexType>
326 294

  
327 295

  
296
	<!-- REMOVE FROM HERE TO THE END -->
297

  
328 298
</xs:schema>
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-datasource-1.0.xsd
16 16
				<xs:element name="websiteurl" type="xs:string" />
17 17
				<xs:element name="logourl" type="xs:string" />
18 18
				<xs:element name="contactemail" type="xs:string" />
19
				<xs:element name="datasourcetype" type="controlledElementType">
19
				<xs:element name="datasourcetype" type="qualifierType">
20 20
					<xs:annotation>
21 21
						<xs:documentation>For allowed values check terms in:http://api.openaire.eu/vocabularies/dnet:datasource_typologies</xs:documentation>
22 22
					</xs:annotation>
23 23
				</xs:element>
24
				<xs:element name="openairecompatibility" type="controlledElementType">
24
				<xs:element name="openairecompatibility" type="qualifierType">
25 25
					<xs:annotation>
26 26
						<xs:documentation>
27 27
							Level of compatibility of this datasource with regards to the
......
43 43
				<xs:element name="latitude" type="xs:string"  />
44 44
				<xs:element name="longitude" type="xs:string"  />
45 45
				<xs:element name="description" type="xs:string" />
46
				<xs:element name="subjects" type="typedElementType">
46
				<xs:element name="subjects" type="structuredPropertyElementType">
47 47
					<xs:annotation>
48 48
						<xs:documentation>
49 49
							Subjects and keywords.
......
62 62
						</xs:documentation>
63 63
					</xs:annotation>
64 64
				</xs:element>
65
				<xs:element name="pid" type="typedElementType" />
65
				<xs:element name="pid" type="structuredPropertyElementType" />
66 66
				<xs:element name="rels" type="relsType">
67 67
					<xs:annotation>
68 68
						<xs:documentation>Relationships to other entities.
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-result-1.0.xsd
2 2
	xmlns="http://namespace.openaire.eu/oaf" targetNamespace="http://namespace.openaire.eu/oaf">
3 3

  
4 4
	<xs:annotation>
5
		<xs:documentation>This schema describes elements and properties of the OpenAIRE Result
6
			entity:
7
			https://issue.openaire.research-infrastructures.eu/projects/openaire2020-wiki/wiki/Core_entity_result
8
			that includes Publication and Dataset entities. </xs:documentation>
5
		<xs:documentation>This schema describes elements and properties of the OpenAIRE Result entity. For an overview of the model, please check the OpenAIRE Research Graph Data Model at https://doi.org/10.5281/zenodo.2643199</xs:documentation>
9 6
	</xs:annotation>
10 7

  
11 8
	<xs:include schemaLocation="oaf-common-1.0.xsd"/>
......
13 10
	<xs:element name="result">
14 11
		<xs:complexType>
15 12
			<xs:choice maxOccurs="unbounded">
16
				<xs:element name="title" type="xs:string">
17
					<xs:annotation>
18
						<xs:documentation> Title of this research result. <p>Different types of
19
								titles are allowed: see http://api.openaire.eu/vocabularies/dnet:dataCite_title</p>
20
						</xs:documentation>
21
					</xs:annotation>
13
				<xs:element name="creator">
14
					<xs:complexType>
15
						<xs:simpleContent>
16
							<xs:extension base="xs:string">
17
								<xs:attribute name="name" type="xs:string"/>
18
								<xs:attribute name="surname" type="xs:string"/>
19
								<xs:attribute name="ORCID" type="xs:string"/>
20
								<xs:attribute name="rank" type="xs:int"/>
21
							</xs:extension>
22
						</xs:simpleContent>
23
					</xs:complexType>
22 24
				</xs:element>
23
				<xs:element name="dateofacceptance" type="xs:string"/>
24
				<xs:element name="publisher" type="xs:string"/>
25
				<xs:element name="description" type="xs:string"/>
26
				<xs:element name="pid" type="typedElementType">
25
				<xs:element name="resulttype" type="qualifierType">
27 26
					<xs:annotation>
28
						<xs:documentation> Persistent identifier. <p>For allowed pid systems check:
29
								http://api.openaire.eu/vocabularies/dnet:pid_types </p>
27
						<xs:documentation> Tells if this record is about a publication or a dataset.
28
							<p>For allowed values check:
29
								http://api.openaire.eu/vocabularies/dnet:result_typologies </p>
30 30
						</xs:documentation>
31 31
					</xs:annotation>
32 32
				</xs:element>
33
				<xs:element name="language" type="controlledElementType">
33
				<xs:element name="language" type="qualifierType"/>
34
				<xs:element name="country" type="dataInfoType"/>
35
				<xs:element name="subject" type="structuredPropertyElementType"/>
36
				<xs:element name="title" type="structuredPropertyElementType">
34 37
					<xs:annotation>
35
						<xs:documentation> Language in ISO 639-2.</xs:documentation>
36
					</xs:annotation>
37
				</xs:element>
38
				<xs:element name="relevantdate" type="xs:string"/>
39
				<xs:element name="subject" type="typedElementType"/>
40
				<xs:element name="resulttype" type="xs:string">
41
					<xs:annotation>
42
						<xs:documentation> Tells if this record is about a publication or a dataset.
43
								<p>For allowed values check:
44
								http://api.openaire.eu/vocabularies/dnet:result_typologies </p>
38
						<xs:documentation> Title of this research result. <p>Different types of
39
								titles are allowed: see http://api.openaire.eu/vocabularies/dnet:dataCite_title</p>
45 40
						</xs:documentation>
46 41
					</xs:annotation>
47 42
				</xs:element>
48

  
49
				<xs:element name="journal" type="journalType"/>
50

  
43
				<xs:element name="relevantdate" type="structuredPropertyElementType"/>
44
				<xs:element name="description" type="xs:string"/>	
45
				<xs:element name="dateofacceptance" type="xs:string"/>
46
				<xs:element name="publisher" type="xs:string"/>	
47
				<xs:element name="embargoenddate" type="xs:string"/>
51 48
				<xs:element name="source" type="xs:string">
52 49
					<xs:annotation>
53 50
						<xs:documentation>The semantics of this field is inherited from dc:source in
54 51
							Dublin Core. </xs:documentation>
55 52
					</xs:annotation>
56 53
				</xs:element>
57
				<xs:element name="country" type="controlledElementType"/>
58

  
59
				<xs:element name="embargoenddate" type="xs:string"/>
60
				<xs:element name="resourcetype" type="xs:string">
54
				<xs:element name="format" type="xs:string"/>
55
				<xs:element name="contributor" type="xs:string"/>
56
				<xs:element name="resourcetype" type="qualifierType">
61 57
					<xs:annotation>
62 58
						<xs:documentation> This field is valid only if resulttype is "dataset". It
63 59
							expresses the nature of the dataset. <p>For allowed values check:
......
65 61
						</xs:documentation>
66 62
					</xs:annotation>
67 63
				</xs:element>
64
				<xs:element name="coverage" type="xs:string"/>
65
				<xs:element name="bestaccessright" type="qualifierType">
66
					<xs:annotation>
67
						<xs:documentation> The best access right available for this result among the
68
							available licenses of its children elements. <p>For allowed values
69
								check: http://api.openaire.eu/vocabularies/dnet:access_modes </p>
70
						</xs:documentation>
71
					</xs:annotation>
72
				</xs:element>
73
				<xs:element name="journal" type="journalType"/>	
74
				<xs:element name="pid" type="structuredPropertyElementType">
75
					<xs:annotation>
76
						<xs:documentation> Persistent identifier. <p>For allowed pid systems check:
77
								http://api.openaire.eu/vocabularies/dnet:pid_types </p>
78
						</xs:documentation>
79
					</xs:annotation>
80
				</xs:element>
68 81
				<xs:element name="device" type="xs:string">
69 82
					<xs:annotation>
70 83
						<xs:documentation> This field is valid only if resulttype is "dataset". It
......
78 91
							contains information about the size of the dataset. </xs:documentation>
79 92
					</xs:annotation>
80 93
				</xs:element>
81
				<xs:element name="format" type="xs:string">
82
					<xs:annotation>
83
						<xs:documentation> This field is valid only if resulttype is "dataset". It
84
							contains information about the format of the dataset.
85
						</xs:documentation>
86
					</xs:annotation>
87
				</xs:element>
88 94
				<xs:element name="version" type="xs:string">
89 95
					<xs:annotation>
90 96
						<xs:documentation> This field is valid only if resulttype is "dataset". It
......
113 119
							result has been collected from (e.g., "OpenDOAR"). </xs:documentation>
114 120
					</xs:annotation>
115 121
				</xs:element>
116
				<xs:element name="bestlicense" type="controlledElementType">
122
				<xs:element name="context" type="contextType">
117 123
					<xs:annotation>
118
						<xs:documentation> The best license available for this result among the
119
							available licenses of its children elements. <p>For allowed values
120
								check: http://api.openaire.eu/vocabularies/dnet:access_modes </p>
121
						</xs:documentation>
124
						<xs:documentation>Research community, initiative, infrastructure or funding agency related to this result.</xs:documentation>
122 125
					</xs:annotation>
123 126
				</xs:element>
124
				<xs:element name="community" type="communityType">
125
					<xs:annotation>
126
						<xs:documentation>Research community related to this entity.</xs:documentation>
127
					</xs:annotation>
128
				</xs:element>
129
				<!--<xs:element name="datainfo" type="datainfoType"/> -->
130 127
				<xs:element name="rels" type="relsType">
131 128
					<xs:annotation>
132 129
						<xs:documentation>Relationships to other entities. </xs:documentation>
133 130
					</xs:annotation>
134 131
				</xs:element>
135 132
				<xs:element name="instances" type="instancesType" minOccurs="1" maxOccurs="1"/>
136

  
137 133
				<xs:element name="citations" type="citationsType" maxOccurs="1" minOccurs="0"/>
138 134
			</xs:choice>
139 135
		</xs:complexType>
......
161 157
	</xs:complexType>
162 158

  
163 159
	<xs:complexType name="journalType">
164
		<xs:annotation>
165
			<xs:documentation>Journal where the publication has been published. Attributes refer to
166
				electronic, printed and linking (ISSN-L) ISSN. This field is applicable when
167
				resulttype is "publication". </xs:documentation>
168
		</xs:annotation>
169 160
		<xs:simpleContent>
170 161
			<xs:extension base="xs:string">
171 162
				<xs:attribute name="eissn" use="optional"/>
172 163
				<xs:attribute name="issn" use="optional"/>
173 164
				<xs:attribute name="lissn" use="optional"/>
165
				<xs:attribute name="ep" use="optional"/>
166
				<xs:attribute name="iss" use="optional"/>
167
				<xs:attribute name="sp" use="optional"/>
168
				<xs:attribute name="vol" use="optional"/>			
174 169
			</xs:extension>
175 170
		</xs:simpleContent>
176 171
	</xs:complexType>
177

  
178
	<!-- <oaf:context id="egi" label="EGI" type="community">
179
            <oaf:category id="egi::virtual" label="EGI virtual organizations">
180
                <oaf:concept id="egi::virtual::2" label="alice"/>
181
            </oaf:category>
182
        </oaf:context>
183
         <oaf:community id="{@id}" label="{@label}">
184
            <xsl:apply-templates/>
185
        </oaf:community>
186
	-->
187
	<xs:complexType name="communityType">
188
		<xs:complexContent>
189
			<xs:extension base="labeledIdElementType">
190
				<xs:sequence maxOccurs="unbounded">
191
					<xs:element name="category" type="categoryType"/>
192
				</xs:sequence>
193
			</xs:extension>
194
		</xs:complexContent>
195
	</xs:complexType>
196

  
197
	<xs:complexType name="categoryType">
198
		<xs:complexContent>
199
			<xs:extension base="labeledIdElementType">
200
				<xs:sequence minOccurs="0" maxOccurs="unbounded">
201
					<xs:element name="concept" type="conceptType"/>
202
				</xs:sequence>
203
			</xs:extension>
204
		</xs:complexContent>
205
	</xs:complexType>
206

  
207
	<xs:complexType name="conceptType">
208
		<xs:complexContent>
209
			<xs:extension base="labeledIdElementType">
210
				<xs:sequence maxOccurs="unbounded" minOccurs="0">
211
					<xs:element name="concept" type="conceptType"/>
212
				</xs:sequence>
213
			</xs:extension>
214
		</xs:complexContent>
215
	</xs:complexType>
216

  
217 172
	<xs:complexType name="instancesType">
218 173
		<xs:sequence>
219 174
			<xs:element name="instance" type="instanceType" minOccurs="1" maxOccurs="unbounded">
......
229 184

  
230 185
	<xs:complexType name="instanceType">
231 186
		<xs:choice maxOccurs="unbounded">
232
			<xs:element name="licence" type="controlledElementType">
187
			<xs:element name="license" type="fieldType">
233 188
				<xs:annotation>
234 189
					<xs:documentation> License to access this actual manifestation of the
235
						publication or dataset. <p>For allowed values check:
236
							http://api.openaire.eu/vocabularies/dnet:access_modes </p>
237
						<p>When several instances are available for the same publication, the opener
238
							license is selected as the bestlicese field in element result. </p>
190
						result. Typically it is a URL. OpenAIRE does not yet attempt any harmonization and reflect the original values that are available in the collected metadata records. 
239 191
					</xs:documentation>
240 192
				</xs:annotation>
241 193
			</xs:element>
242
			<xs:element name="instancetype" type="xs:string">
194
			<xs:element name="accessright" type="qualifierType"/>
195
			<xs:element name="instancetype" type="qualifierType">
243 196
				<xs:annotation>
244 197
					<xs:documentation> Type of the instance, for example: article, thesis, etc.
245 198
							<p>For allowed values check: http://api.openaire.eu/vocabularies/dnet:publication_resource
......
247 200
					</xs:documentation>
248 201
				</xs:annotation>
249 202
			</xs:element>
203
			<xs:element name="collectedfrom" type="namedIdElementType" maxOccurs="1">
204
				<xs:annotation>
205
					<xs:documentation>Datasource from which OpenAIRE collected the description of this instance.</xs:documentation>
206
				</xs:annotation>
207
			</xs:element>
250 208
			<xs:element name="hostedby" type="namedIdElementType" maxOccurs="1">
251 209
				<xs:annotation>
252 210
					<xs:documentation>Datasource hosting this file. </xs:documentation>
......
254 212
			</xs:element>
255 213
			<xs:element name="webresource" type="webresourceType" minOccurs="1"
256 214
				maxOccurs="unbounded"/>
215
			<xs:element name="distributionlocation" type="xs:string" minOccurs="0"/>
216
			<xs:element name="dateofacceptance" type="xs:string" minOccurs="0"/>
217
			<xs:element name="processingchargeamount" type="fieldType">
218
				<xs:annotation>
219
					<xs:documentation> Article/Book Processing Charge </xs:documentation>
220
				</xs:annotation>
221
			</xs:element>
222
			<xs:element name="processingchargecurrency" type="fieldType">
223
				<xs:annotation>
224
					<xs:documentation>Currency for the value in processingchargeamount </xs:documentation>
225
				</xs:annotation>
226
			</xs:element>
227
			<xs:element name="refereed" type="fieldType">
228
				<xs:annotation>
229
					<xs:documentation>Peer-review status</xs:documentation>
230
				</xs:annotation>
231
			</xs:element>
257 232
		</xs:choice>
258 233
		<xs:attribute name="id" use="required"/>
259 234
	</xs:complexType>
modules/dnet-openaire-schema/trunk/schema/1.0/oaf-1.0.xsd
4 4
  targetNamespace="http://namespace.openaire.eu/oaf">
5 5

  
6 6
  <xs:annotation>
7
    <xs:documentation>This schema describes the OpenAIRE+ entities.</xs:documentation>
7
    <xs:documentation>This schema describes the XML serialization of the OpenAIRE Research Graph. 
8
      For an overview of the model, please check the OpenAIRE Research Graph Data Model at https://doi.org/10.5281/zenodo.2643199
9
    </xs:documentation>
8 10
  </xs:annotation>
9 11

  
10 12
  <xs:include schemaLocation="oaf-result-1.0.xsd"/>
11
  <xs:include schemaLocation="oaf-person-1.0.xsd"/>
12 13
  <xs:include schemaLocation="oaf-org-1.0.xsd"/>
13 14
  <xs:include schemaLocation="oaf-datasource-1.0.xsd"/>
14 15
  <xs:include schemaLocation="oaf-project-1.0.xsd"/>
......
18 19
      <xs:sequence>
19 20
        <xs:choice>
20 21
          <xs:element ref="result"/>
21
          <xs:element ref="person"/>
22 22
          <xs:element ref="organization"/>
23 23
          <xs:element ref="datasource"/>
24 24
          <xs:element ref="project"/>

Also available in: Unified diff