Skip to content

Commit

Permalink
updated concepts in specs to NOV-16 + fixes
Browse files Browse the repository at this point in the history 
- The CSV source files have been downloaded and updated to match the
  most recent meeting on NOV-16. RDF+HTML has been generated. The new
  concepts (rights, rules, etc.) have NOT been included.
- fixes #72 broken link in DPV HTML
- fixes #58 incorrect labels
- fixes #70 typos in terms
- resolves #59 adding owl:import to DPV-OWL specs
- resolves #42 adding Machester syntax serializations for DPV-OWL
  • Loading branch information
@coolharsh55
coolharsh55 committed Nov 19, 2022
1 parent 187344d commit 8a785f2
Show file tree
Hide file tree
Showing 511 changed files with 286,279 additions and 273,020 deletions.
4 changes: 2 additions & 2 deletions documentation-generator/jinja2_resources/template_dpv.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@
<table>
<tr>
<td>Concept</td>
<td>Relevant Section</td>
<td>Relation</td>
</tr>
<tr>
<td>[=PersonalData=]</td>
<td><a href="vocab-personaldata">link</a></td>
<td>[=hasPersonalData=]</td>
</tr>
<tr>
<td>[=Purpose=]</td>
Expand Down
2 changes: 1 addition & 1 deletion documentation-generator/jinja2_resources/template_dpv_owl.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
</tr>
<tr>
<td>[=PersonalData=]</td>
<td><a href="vocab-personaldata">link</a></td>
<td>[=hasPersonalData=]</td>
</tr>
<tr>
<td>[=Purpose=]</td>
Expand Down
2 changes: 1 addition & 1 deletion documentation-generator/jinja2_resources/template_dpv_skos.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ ex:PurposeXYZ rdfs:subClassOf dpvs:RequestedServiceProvision
</tr>
<tr>
<td>[=PersonalData=]</td>
<td><a href="vocab-personaldata">link</a></td>
<td>[=hasPersonalData=]</td>
</tr>
<tr>
<td>[=Purpose=]</td>
Expand Down
1 change: 0 additions & 1 deletion documentation-generator/log
View file

This file was deleted.

8,681 changes: 8,125 additions & 556 deletions documentation-generator/logs/902.txt
View file

Large diffs are not rendered by default.

414 changes: 235 additions & 179 deletions documentation-generator/logs/993.txt
View file

Large diffs are not rendered by default.

251 changes: 116 additions & 135 deletions documentation-generator/logs/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
Failed to convert Literal lexical form to value. Datatype=http://www.w3.org/2001/XMLSchema#date, Converter=<function parse_date at 0x7f4e95382ac0>
Traceback (most recent call last):
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/rdflib/term.py", line 2084, in _castLexicalToPython
return conv_func(lexical) # type: ignore[arg-type]
^^^^^^^^^^^^^^^^^^
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/isodate/isodates.py", line 203, in parse_date
raise ISO8601Error('Unrecognised ISO 8601 date format: %r' % datestring)
isodate.isoerror.ISO8601Error: Unrecognised ISO 8601 date format: ''
Failed to convert Literal lexical form to value. Datatype=http://www.w3.org/2001/XMLSchema#date, Converter=<function parse_date at 0x7f4e95382ac0>
Traceback (most recent call last):
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/rdflib/term.py", line 2084, in _castLexicalToPython
return conv_func(lexical) # type: ignore[arg-type]
^^^^^^^^^^^^^^^^^^
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/isodate/isodates.py", line 203, in parse_date
raise ISO8601Error('Unrecognised ISO 8601 date format: %r' % datestring)
isodate.isoerror.ISO8601Error: Unrecognised ISO 8601 date format: ''
Failed to convert Literal lexical form to value. Datatype=http://www.w3.org/2001/XMLSchema#date, Converter=<function parse_date at 0x7f4e95382ac0>
Traceback (most recent call last):
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/rdflib/term.py", line 2084, in _castLexicalToPython
return conv_func(lexical) # type: ignore[arg-type]
^^^^^^^^^^^^^^^^^^
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/isodate/isodates.py", line 203, in parse_date
raise ISO8601Error('Unrecognised ISO 8601 date format: %r' % datestring)
isodate.isoerror.ISO8601Error: Unrecognised ISO 8601 date format: ''
Failed to convert Literal lexical form to value. Datatype=http://www.w3.org/2001/XMLSchema#date, Converter=<function parse_date at 0x7f4e95382ac0>
Traceback (most recent call last):
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/rdflib/term.py", line 2084, in _castLexicalToPython
return conv_func(lexical) # type: ignore[arg-type]
^^^^^^^^^^^^^^^^^^
File "/home/harsh/.pyenv/versions/dpv/lib/python3.11/site-packages/isodate/isodates.py", line 203, in parse_date
raise ISO8601Error('Unrecognised ISO 8601 date format: %r' % datestring)
isodate.isoerror.ISO8601Error: Unrecognised ISO 8601 date format: ''

--- DPV ---
MODULE: base
Expand Down Expand Up @@ -28,119 +60,98 @@ MODULE: entities_organisation
added: 0 ; removed: 0
---
MODULE: entities
added: 0 ; removed: 0
added: 1 ; removed: 0

Concepts Added
https://w3id.org/dpv#isRepresentativeFor
---
MODULE: jurisdiction
added: 3 ; removed: 0
added: 1 ; removed: 1
Concepts Removed
https://w3id.org/dpv#PubliclyLocation

Concepts Added
https://w3id.org/dpv#City
https://w3id.org/dpv#PrivateLocation
https://w3id.org/dpv#PubliclyLocation
https://w3id.org/dpv#PublicLocation
---
MODULE: legal_basis
added: 1 ; removed: 0

Concepts Added
https://w3id.org/dpv#LegitimateInterestOfDataSubject
added: 0 ; removed: 0
---
MODULE: organisational_measures
added: 5 ; removed: 0
added: 1 ; removed: 5
Concepts Removed
https://w3id.org/dpv#ReviewImpactAssessmentConformance
https://w3id.org/dpv#ReviewImpactAssessmentAdequacy
https://w3id.org/dpv#SecurityAssessments
https://w3id.org/dpv#DataProcessingRecords
https://w3id.org/dpv#CybersecurityAssessments

Concepts Added
https://w3id.org/dpv#ConsultationWithDataSubjectRepresentative
https://w3id.org/dpv#ReviewImpactAssessmentAdequacy
https://w3id.org/dpv#ReviewImpactAssessment
https://w3id.org/dpv#ReviewProcedure
https://w3id.org/dpv#ReviewImpactAssessmentConformance
https://w3id.org/dpv#CybersecurityAssessment
---
MODULE: personal_data
added: 1 ; removed: 1
Concepts Removed
https://w3id.org/dpv#PseudoAnonymisedData
added: 3 ; removed: 0

Concepts Added
https://w3id.org/dpv#PseudonymisedData
https://w3id.org/dpv#IncorrectData
https://w3id.org/dpv#UnverifiedData
https://w3id.org/dpv#VerifiedData
---
MODULE: processing_context
added: 2 ; removed: 0
added: 3 ; removed: 0

Concepts Added
https://w3id.org/dpv#EvaluationOfIndividuals
https://w3id.org/dpv#ScoringOfIndividuals
https://w3id.org/dpv#DataController
https://w3id.org/dpv#DataSubject
https://w3id.org/dpv#ThirdParty
---
MODULE: processing_scale
added: 0 ; removed: 0
---
MODULE: processing
added: 1 ; removed: 1
Concepts Removed
https://w3id.org/dpv#PseudoAnonymise

Concepts Added
https://w3id.org/dpv#Pseudonymise
added: 0 ; removed: 0
---
MODULE: purposes
added: 1 ; removed: 1
added: 12 ; removed: 10
Concepts Removed
https://w3id.org/dpv#CreatePersonalizedRecommendations
https://w3id.org/dpv#IdentifyRectifyImpairments
https://w3id.org/dpv#CreateEventRecommendations
https://w3id.org/dpv#HumanResources
https://w3id.org/dpv#RegistrationAuthentication
https://w3id.org/dpv#ServicePersonalization
https://w3id.org/dpv#CreatePersonalisedRecommendations
https://w3id.org/dpv#ServiceRecordManagement
https://w3id.org/dpv#Payment
https://w3id.org/dpv#ServiceOptimization
https://w3id.org/dpv#CreateProductRecommendations

Concepts Added
https://w3id.org/dpv#CreatePersonalisedRecommendations
https://w3id.org/dpv#RepairImpairments
https://w3id.org/dpv#FulfilmentOfContractualObligation
https://w3id.org/dpv#PaymentManagement
https://w3id.org/dpv#FulfilmentOfObligation
https://w3id.org/dpv#ServicePersonalisation
https://w3id.org/dpv#ServiceRegistration
https://w3id.org/dpv#ServiceOptimisation
https://w3id.org/dpv#SearchFunctionalities
https://w3id.org/dpv#ProvideProductRecommendations
https://w3id.org/dpv#ProvidePersonalisedRecommendations
https://w3id.org/dpv#EstablishContractualAgreement
https://w3id.org/dpv#ProvideEventRecommendations
---
MODULE: risk
added: 0 ; removed: 0
---
MODULE: status
added: 8 ; removed: 0

Concepts Added
https://w3id.org/dpv#LawfulnessUnkown
https://w3id.org/dpv#ConformanceStatus
https://w3id.org/dpv#hasLawfulness
https://w3id.org/dpv#Lawfulness
https://w3id.org/dpv#Unlawful
https://w3id.org/dpv#NonConformant
https://w3id.org/dpv#Conformant
https://w3id.org/dpv#Lawful
added: 0 ; removed: 0
---
MODULE: technical_measures
added: 4 ; removed: 5
Concepts Removed
https://w3id.org/dpv#MonotonicCounterPseudoanonymisation
https://w3id.org/dpv#EncryptionInRest
https://w3id.org/dpv#PseudoAnonymisation
https://w3id.org/dpv#Pseudoanonymisation
https://w3id.org/dpv#RNGPseudoanonymisation

Concepts Added
https://w3id.org/dpv#RNGPseudonymisation
https://w3id.org/dpv#MonotonicCounterPseudonymisation
https://w3id.org/dpv#EncryptionInUse
https://w3id.org/dpv#EncryptionAtRest
added: 0 ; removed: 0
---
MODULE: technical_organisational_measures
added: 0 ; removed: 0
---
MODULE: rules
added: 15 ; removed: 0

Concepts Added
https://w3id.org/dpv#RulesConcepts
https://w3id.org/dpv#isSubTypeOf
https://w3id.org/dpv#hasProhibition
https://w3id.org/dpv#Rule
https://w3id.org/dpv#isInstanceOf
https://w3id.org/dpv#hasPermission
https://w3id.org/dpv#Concept
https://w3id.org/dpv#Permission
https://w3id.org/dpv#hasDomain
https://w3id.org/dpv#Relation
https://w3id.org/dpv#Obligation
https://w3id.org/dpv#Prohibition
https://w3id.org/dpv#hasRule
https://w3id.org/dpv#hasObligation
https://w3id.org/dpv#hasRange
added: 0 ; removed: 0
---

--- DPV-GDPR ---
Expand All @@ -154,42 +165,47 @@ MODULE: legal_basis_data_transfer
added: 0 ; removed: 0
---
MODULE: rights
added: 0 ; removed: 0
added: 6 ; removed: 0

Concepts Added
https://w3id.org/dpv/dpv-gdpr#IndirectDataCollectionNotice
https://w3id.org/dpv/dpv-gdpr#SARNotice
http://www.w3.org/ns/dcat#Resource
https://w3id.org/dpv/dpv-gdpr#RightsRecipientsNotice
https://w3id.org/dpv/dpv-gdpr#DirectDataCollectionNotice
https://w3id.org/dpv#RightFulfilmentNotice
---
MODULE: data_transfers
added: 0 ; removed: 0
---
MODULE: dpia
added: 7 ; removed: 0
added: 16 ; removed: 0

Concepts Added
https://w3id.org/dpv#ConformanceStatus
https://w3id.org/dpv/dpv-gdpr#DPIARecommendsProcessingContinue
https://w3id.org/dpv/dpv-gdpr#DPIANonConformant
https://w3id.org/dpv/dpv-gdpr#DPIAConformant
https://w3id.org/dpv/dpv-gdpr#DPIAConformity
https://w3id.org/dpv/dpv-gdpr#DPIAProcessingRecommendation
https://w3id.org/dpv/dpv-gdpr#DPIARecommendsProcessingNotContinue
http://purl.org/dc/terms/isVersionOf
http://purl.org/dc/terms/title
http://purl.org/dc/terms/created
http://purl.org/dc/terms/coverage
http://purl.org/dc/terms/hasPart
http://purl.org/dc/terms/subject
http://purl.org/dc/terms/description
http://purl.org/dc/terms/isPartOf
http://purl.org/dc/terms/dateSubmitted
http://purl.org/dc/terms/dateAccepted
http://purl.org/dc/terms/valid
http://purl.org/dc/terms/temporal
http://purl.org/dc/terms/conformsTo
https://w3id.org/dpv#hasStatus
http://purl.org/dc/terms/modified
http://purl.org/dc/terms/identifier
---
MODULE: compliance
added: 7 ; removed: 0

Concepts Added
https://w3id.org/dpv/dpv-gdpr#ComplianceConcepts
https://w3id.org/dpv/dpv-gdpr#GDPRComplianceUnknown
https://w3id.org/dpv/dpv-gdpr#GDPRLawulness
https://w3id.org/dpv/dpv-gdpr#GDPRNonCompliant
https://w3id.org/dpv/dpv-gdpr#GDPRLawfulness
https://w3id.org/dpv/dpv-gdpr#GDPRCompliant
https://w3id.org/dpv#Lawfulness
added: 0 ; removed: 0
---

--- DPV-PD ---
MODULE: dpv-pd
added: 1 ; removed: 0

Concepts Added
https://w3id.org/dpv/dpv-pd#CriminalOffense
added: 0 ; removed: 0
---

--- DPV-LEGAL ---
Expand All @@ -203,14 +219,7 @@ MODULE: eu_eea
added: 0 ; removed: 0
---
MODULE: laws
added: 2 ; removed: 2
Concepts Removed
https://w3id.org/dpv/dpv-legal#UK-DPA-2018
https://w3id.org/dpv/dpv-legal#UK-GDPR

Concepts Added
https://w3id.org/dpv/dpv-legal#GB-GDPR
https://w3id.org/dpv/dpv-legal#GB-DPA-2018
added: 0 ; removed: 0
---
MODULE: locations
added: 0 ; removed: 0
Expand All @@ -221,32 +230,12 @@ added: 0 ; removed: 0

--- DPV-TECH ---
MODULE: dpv-tech
added: 11 ; removed: 1
Concepts Removed
https://w3id.org/dpv/dpv-tech#TechnologyConcepts

Concepts Added
https://w3id.org/dpv/dpv-tech#DataConcepts
https://w3id.org/dpv/dpv-tech#hasTechnologyActor
https://w3id.org/dpv/dpv-tech#ToolsConcepts
https://w3id.org/dpv/dpv-tech#
https://w3id.org/dpv/dpv-tech#ProvisionConcepts
https://w3id.org/dpv/dpv-tech#ActorsConcepts
https://w3id.org/dpv/dpv-tech#OpsConcepts
https://w3id.org/dpv/dpv-tech#SecurityConcepts
https://w3id.org/dpv/dpv-tech#CommsConcepts
https://w3id.org/dpv/dpv-tech#CoreConcepts
https://w3id.org/dpv/dpv-tech#SurveillanceConcepts
added: 0 ; removed: 0
---

--- RISK ---
MODULE: risk_consequences
added: 3 ; removed: 0

Concepts Added
https://w3id.org/dpv/risk#ConsequenceForDataSubject
https://w3id.org/dpv/risk#ImpactOnDataSubject
https://w3id.org/dpv/risk#ConsequenceOnDataSecurity
added: 0 ; removed: 0
---
MODULE: risk_assessment
added: 0 ; removed: 0
Expand All @@ -263,13 +252,5 @@ added: 0 ; removed: 0

--- RIGHTS-EU ---
MODULE: rights-eu
added: 0 ; removed: 7
Concepts Removed
https://w3id.org/dpv/rights/eu#hasProvisionMethod
https://w3id.org/dpv/rights/eu#hasCommunicationMechanism
https://w3id.org/dpv/rights/eu#hasDeveloper
https://w3id.org/dpv/rights/eu#hasSubject
https://w3id.org/dpv/rights/eu#hasProvider
https://w3id.org/dpv/rights/eu#hasTRL
https://w3id.org/dpv/rights/eu#hasUser
added: 0 ; removed: 0
---
Loading

0 comments on commit 8a785f2

Please sign in to comment.