From 15b805a9f754f454a5629e0056b7ceceda97ab2c Mon Sep 17 00:00:00 2001 From: Jonas Schlabertz <jonas@schlabertz.de> Date: Tue, 31 May 2022 15:47:30 +0200 Subject: [PATCH] PROV model integration. --- API.paw | Bin 28591 -> 28629 bytes src/entity/ComponentInformation.ts | 6 +++--- src/entity/Measurement.ts | 2 ++ src/util/ContextDefinitions.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/API.paw b/API.paw index 071cb5ae605066d9cf7866994ea3bb596249d413..70b1fc8df8c4da1002cc2433e7f33371487bbba2 100644 GIT binary patch delta 9838 zcmZ2~pYiH_#tGt*sSIGiRsg0L7#tvUrs_n4V#c)-m)x!2z_^)l3*%14{fq|~k1(ER zyuf&w@e1Qj#`}zq8GkeWVf@d;z{JSJ#>CFV&m_Pk$Rx@n$)v!f%%sAk$)v?(z+}i| z!Q{l`%;du4&g8=s#1zaF&XmNI%#_BI&XmJc#8k{w&eX)z%+$uz&eX#+iD@#^bf!g2 zi<y=&EoWN8w5gtHGt+jaLrjO6jxil)I>U5{=^E2JruR&rm_9RoVfxARpP7M~g_)mO zfLWMXgjteVidl(SnOTKdgIR~!gxQqYg4veYnc0&$m^p+woH>R$g*k&chq;BhmAQkt zlevqzpLr_tEaoN5OPN<NuVvoMyq)<F^I_&=%*UC}FkfQ6#$5l7`91R|=FiMun18Y` zv#_vmu<)=5uxPMovgokrvgolGvzV~hu-LNLu{g1~v-q<FumrP2u*9(>u~e~Cv(&NF zvox?Yvb3@EuuNi^!!nm;0n1XBwJaN1wzBMH*~fB_<rvEumJ2MmS?;jhXL-Q#l;thU zN0z^=qO4-9lB`m!()FwgtZJ-Utfs7Htd^`+toE#~te&iitVyh?tZA(2tU0VjtYxf? ztWB(~tZl4atlg{=StqehWu3*kfOQG$9@f3A2UriX9%4PtdY1Jf>r2*GtZ!N0vA$>h z!1|T-FB>BpD;p0RKbruXD4R5!JewAqHk%%sKAQ=f6`LKKCz}^ry)T;|TQFNRTRdAb zTQyq^TRmF?TO(T=TRU4n+XS|$Y%|#wvMpj;%C?Ga1KSq1Gi+zsF0fr>yTo>x?FQQe zwkK>a*csRv*;&|G+1c2+*#+4p*p=9o+11#!*$vrE*&Wy&*<ILO*}d2U*hARk*%R0k z*;Ck4*|XRS*h|>!*&CSHn>YVr4q>b>XsBptXy|H~+%UUgal`6{%?-O74mX@_xZH53 z;ZeiOhK~(@8X4Id8TlI-MH?Aq8X1)v8Fd;NjT;%Q8yTG%8QmKh{Tmr08X4mo8PggW za~m1U8X4;w89N#oCpI!pZ)BX;$hfS*Nq|j&M?gqGML<iyK)_7EMu1U(S3p=mb@N%) zGyE!yOBvQNE@yONT*<hKVL8L{hMWe|hTMkmhP;OS2IB_f1`7d($-6}}7≦5&NaK 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 delta 9776 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 P<~rsn%nK$@%y$6*FopQY diff --git a/src/entity/ComponentInformation.ts b/src/entity/ComponentInformation.ts index ec84732..3a5e3c0 100644 --- a/src/entity/ComponentInformation.ts +++ b/src/entity/ComponentInformation.ts @@ -169,7 +169,7 @@ export default class ComponentInformation { toJSONLD(): Record<string, unknown> { const document: Record<string, unknown> = { "@context": ContextDefinitions.information(this.type.context, this.previousVersion, this.nextVersion), - "@type": "ComponentInformation", + "@type": "prov:Entity", "identifier": { "@id": `${config.baseURL}/information/${this.id.toString()}` }, "dateCreated": this.dateCreated.toISOString(), "name": this.name, @@ -185,11 +185,11 @@ export default class ComponentInformation { }; if(this.nextVersion) { - document.nextVersion = { "@id": `${config.baseURL}/information/${this.nextVersion.id.toString()}` }; + document["prov:hadRevision"] = { "@id": `${config.baseURL}/information/${this.nextVersion.id.toString()}` }; } if(this.previousVersion) { - document.previousVersion = { "@id": `${config.baseURL}/information/${this.previousVersion.id.toString()}` }; + document["prov:wasRevisionOf"] = { "@id": `${config.baseURL}/information/${this.previousVersion.id.toString()}` }; } return document; diff --git a/src/entity/Measurement.ts b/src/entity/Measurement.ts index 5f227cd..a4576d9 100644 --- a/src/entity/Measurement.ts +++ b/src/entity/Measurement.ts @@ -119,9 +119,11 @@ export default class Measurement { toJSONLD(): Record<string, unknown> { const document: Record<string, unknown> = { "@context": ContextDefinitions.measurement(this.valueType.context, this.metadataType?.context), + "@type": "prov:Entity", "identifier": { "@id": `${config.baseURL}/measurement/${this.id.toString()}` }, "dateCreated": this.dateCreated.toISOString(), "license": { "@id": this.license }, + "prov:hadPrimarySource": { "@id": `${config.baseURL}/information/${this.componentInformation.id.toString()}` }, "value": this.value }; diff --git a/src/util/ContextDefinitions.ts b/src/util/ContextDefinitions.ts index 61f614d..1367eb0 100644 --- a/src/util/ContextDefinitions.ts +++ b/src/util/ContextDefinitions.ts @@ -22,7 +22,8 @@ const information = function(metadataContext: unknown, previousVersion: Componen "comment": "https://schema.org/comment", "informationLicense": "https://www.w3.org/1999/xhtml/vocab#license", "measurementLicense": "https://www.w3.org/1999/xhtml/vocab#license", - "topic": "https://schema.org/text" + "topic": "https://schema.org/text", + "prov" : "http://www.w3.org/ns/prov#" }; if(previousVersion) { @@ -38,6 +39,7 @@ const information = function(metadataContext: unknown, previousVersion: Componen const measurement = function(valueContext: unknown, metadataContext: unknown | undefined): Record<string, unknown> { const result: Record<string, unknown> = { + "prov" : "http://www.w3.org/ns/prov#", "id": { "@id": "https://schema.org/url", "@type": "@id"}, "dateCreated": "https://schema.org/dateCreated", "license": "https://www.w3.org/1999/xhtml/vocab#license", -- GitLab