fix/refactor: removed duplicate rule, correct predicate names, improved variable names

This commit is contained in:
mirdono
2024-03-21 15:35:22 +01:00
parent 0b3d1febdf
commit 8755bbc432
3 changed files with 33 additions and 45 deletions

View File

@@ -82,18 +82,6 @@ PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
} => {
?s mandaat:bindingEinde ?eindeDateTime
}.
{
?s mandaat:bindingEinde ?eindeDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
{
?s mandaat:bindingEinde ?eindeDate
} e:becomes {
?s mandaat:bindingEinde ?eindeDateTime
}.
} => {
?s mandaat:bindingEinde ?eindeDateTime
}.
{
?s mandaat:bindingStart ?startDate.
@@ -121,16 +109,16 @@ PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
}.
{
?s mandaat:start ?eindeDate.
?s mandaat:start ?startDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
?startDate :dateTimeFromDate ?startDateTime.
{
?s mandaat:start ?eindeDate
?s mandaat:start ?startDate
} e:becomes {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
} => {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
{

View File

@@ -69,7 +69,7 @@ PREFIX lblodlg: <http://data.lblod.info/vocabularies/leidinggevenden/>
# Test
# ex:s <http://data.vlaanderen.be/ns/mandaat#einde> "2019-02-01T10:32:52+00:00"^^xsd:dateTime.
{
?s mandaat:bindingeinde ?eindeDate.
?s mandaat:bindingEinde ?eindeDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
{
@@ -82,16 +82,16 @@ PREFIX lblodlg: <http://data.lblod.info/vocabularies/leidinggevenden/>
}.
{
?s mandaat:start ?eindeDate.
?s mandaat:start ?startDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
?startDate :dateTimeFromDate ?startDateTime.
{
?s mandaat:start ?eindeDate
?s mandaat:start ?startDate
} e:becomes {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
} => {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
{
@@ -108,7 +108,7 @@ PREFIX lblodlg: <http://data.lblod.info/vocabularies/leidinggevenden/>
}.
{
?s mandaat:bindingstart ?startDate.
?s mandaat:bindingStart ?startDate.
# use backward arrow rule defined below
?startDate :dateTimeFromDate ?startDateTime.
{

View File

@@ -66,7 +66,20 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
# Test
# ex:s <http://data.vlaanderen.be/ns/mandaat#start> "2019-01-01T19:32:52+00:00"^^xsd:dateTime.
{
?s mandaat:bindingeinde ?eindeDate.
?s mandaat:bindingStart ?startDate.
# use backward arrow rule defined below
?startDate :dateTimeFromDate ?startDateTime.
{
?s mandaat:bindingStart ?startDate
} e:becomes {
?s mandaat:bindingStart ?startDateTime
}.
} => {
?s mandaat:bindingStart ?startDateTime
}.
{
?s mandaat:bindingEinde ?eindeDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
{
@@ -79,16 +92,16 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
}.
{
?s mandaat:start ?eindeDate.
?s mandaat:start ?startDate.
# use backward arrow rule defined below
?eindeDate :dateTimeFromDate ?eindeDateTime.
?startDate :dateTimeFromDate ?startDateTime.
{
?s mandaat:start ?eindeDate
?s mandaat:start ?startDate
} e:becomes {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
} => {
?s mandaat:start ?eindeDateTime
?s mandaat:start ?startDateTime
}.
{
@@ -104,19 +117,6 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
?s mandaat:einde ?eindeDateTime
}.
{
?s mandaat:bindingstart ?startDate.
# use backward arrow rule defined below
?startDate :dateTimeFromDate ?startDateTime.
{
?s mandaat:bindingStart ?startDate
} e:becomes {
?s mandaat:bindingStart ?startDateTime
}.
} => {
?s mandaat:bindingStart ?startDateTime
}.
{
?s ch:startdatum ?startDate.
# use backward arrow rule defined below
@@ -155,8 +155,8 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
# to come to the date that the DL user selected (in CE(S)T)
{
?date :dateTimeFromDate ?dateTime
}
<=
}
<=
{
( ?date 1 10 ) string:substring ?dateSolo .
(?dateSolo "T02:00:00") string:concatenation ?datePlusTime.