Skip to content

Commit e224cc7

Browse files
committed
updated schema
1 parent 0893ae8 commit e224cc7

File tree

3 files changed

+45
-7
lines changed

3 files changed

+45
-7
lines changed

reproschema/tests/contexts/generic

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,18 @@
166166
"@id": "reproschema:column",
167167
"@type": "xsd:string"
168168
},
169+
"randomMaxDelay": {
170+
"@id": "reproschema:randomMaxDelay"
171+
},
172+
"schedule": {
173+
"@id": "reproschema:schedule"
174+
},
175+
"limit": {
176+
"@id": "reproschema:limit"
177+
},
178+
"maxRetakes": {
179+
"@id": "reproschema:maxRetakes"
180+
},
169181
"importedFrom": {
170182
"@id": "pav:importedFrom",
171183
"@type": "@id"

reproschema/tests/data/activities/activity1.jsonld

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
{ "isAbout": "items/item1.jsonld",
2323
"variableName": "item1",
2424
"requiredValue": true,
25-
"isVis": true}
25+
"isVis": true,
26+
"randomMaxDelay": "2:0:0",
27+
"limit": "2-0",
28+
"schedule": "0 8 * * *"
29+
}
2630
],
2731
"order": [
2832
"items/item1.jsonld"

reproschema/tests/reproschema-shacl.ttl

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ reproschema:ActivityShape a sh:NodeShape ;
5252

5353
[ sh:nodeKind sh:IRI ;
5454
sh:in ( reproschema:AllowExport reproschema:DisableBack reproschema:AutoAdvance reproschema:AllowReplay reproschema:Skipped reproschema:DontKnow reproschema:TimedOut ) ;
55-
sh:path reproschema:allow ] ;
55+
sh:path reproschema:allow ],
56+
57+
[ sh:node reproschema:CronTableShape ;
58+
sh:path reproschema:cronTable ] ;
5659
sh:targetClass reproschema:Activity .
5760

5861
reproschema:FieldShape a sh:NodeShape ;
@@ -62,6 +65,9 @@ reproschema:FieldShape a sh:NodeShape ;
6265
sh:minCount 1 ;
6366
sh:path skos:prefLabel ],
6467

68+
[ sh:datatype rdf:langString ;
69+
sh:path skos:altLabel ],
70+
6571
[ sh:datatype rdf:langString ;
6672
sh:path schema:description ],
6773

@@ -93,7 +99,7 @@ reproschema:FieldShape a sh:NodeShape ;
9399
[ sh:node reproschema:AdditionalNoteObj ;
94100
sh:path reproschema:additionalNotesObj ],
95101

96-
[ sh:or ( [ sh:nodeKind sh:IRI ] [ sh:node reproschema:ResponseOptionShape ] ) ;
102+
[ sh:or ( [ sh:nodeKind sh:IRI ] [ sh:node reproschema:ResponseOptionsShape ] ) ;
97103
sh:path reproschema:responseOptions ] ;
98104
sh:targetClass reproschema:Field .
99105

@@ -141,10 +147,13 @@ reproschema:ProtocolShape a sh:NodeShape ;
141147

142148
[ sh:nodeKind sh:IRI ;
143149
sh:in ( reproschema:AllowExport reproschema:DisableBack reproschema:AutoAdvance reproschema:AllowReplay reproschema:Skipped reproschema:DontKnow reproschema:TimedOut ) ;
144-
sh:path reproschema:allow ] ;
150+
sh:path reproschema:allow ],
151+
152+
[ sh:node reproschema:CronTableShape ;
153+
sh:path reproschema:cronTable ] ;
145154
sh:targetClass reproschema:Protocol .
146155

147-
reproschema:ResponseOptionShape a sh:NodeShape ;
156+
reproschema:ResponseOptionsShape a sh:NodeShape ;
148157
sh:closed true ;
149158
sh:ignoredProperties ( rdf:type ) ;
150159
sh:property [ sh:datatype schema:Boolean ;
@@ -191,7 +200,20 @@ reproschema:AddPropertiesShape a sh:NodeShape ;
191200
sh:path skos:prefLabel ],
192201

193202
[ sh:datatype xsd:boolean ;
194-
sh:path schema:valueRequired ] ;
203+
sh:path schema:valueRequired ],
204+
205+
[ sh:datatype rdf:langString ;
206+
sh:path reproschema:randomMaxDelay ],
207+
208+
[ sh:datatype rdf:langString ;
209+
sh:pattern "(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\\d+(ns|us|µs|ms|s|m|h))+)|((((\\d+,)+\\d+|(\\d+(\\/|-)\\d+)|\\d+|\\*) ?){5,7})" ;
210+
sh:path reproschema:schedule ],
211+
212+
[ sh:datatype rdf:langString ;
213+
sh:path reproschema:limit ],
214+
215+
[ sh:datatype xsd:integer ;
216+
sh:path reproschema:maxRetakes ] ;
195217
sh:targetClass reproschema:AdditionalProperty .
196218

197219
reproschema:ChoicesShape a sh:NodeShape ;
@@ -204,7 +226,7 @@ reproschema:ChoicesShape a sh:NodeShape ;
204226
sh:path schema:name ],
205227

206228
[ sh:or ( [ sh:datatype xsd:integer ] [ sh:nodeKind sh:IRI ] [ sh:datatype schema:Boolean ] [ sh:datatype schema:StructuredValue ] [ sh:datatype schema:Text ]) ;
207-
sh:path reproschema:value ];
229+
sh:path reproschema:value ] ;
208230
sh:targetClass reproschema:Choice .
209231

210232
reproschema:IsVisShape a sh:NodeShape ;

0 commit comments

Comments
 (0)