diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 2b7ee60..6a4cdd1 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -82,18 +82,6 @@ PREFIX ere: } => { ?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: }. { - ?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 }. { diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 4726fcc..268d389 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -69,7 +69,7 @@ PREFIX lblodlg: # Test # ex:s "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: }. { - ?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: }. { - ?s mandaat:bindingstart ?startDate. + ?s mandaat:bindingStart ?startDate. # use backward arrow rule defined below ?startDate :dateTimeFromDate ?startDateTime. { diff --git a/config/reasoner/dl2op/private-info/mapping.n3 b/config/reasoner/dl2op/private-info/mapping.n3 index c47268f..e230655 100644 --- a/config/reasoner/dl2op/private-info/mapping.n3 +++ b/config/reasoner/dl2op/private-info/mapping.n3 @@ -66,7 +66,20 @@ PREFIX xsd: # Test # ex:s "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: }. { - ?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: ?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: # 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.