From 35da321e15b3044220fbafbb479c852b867b29cb Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Thu, 4 Jan 2024 15:47:46 +1100 Subject: [PATCH] Fix skos parser to not replace Product type URI by dfc-pt The given productType.rdf file doesn't give us any context for `dfc-pt`, so there was no reason to do that. We still need to do some substitution in the importer, as some times we are given `dfc-pt` as input data. --- .../lib/data_food_consortium/connector/importer.rb | 4 ++-- .../lib/data_food_consortium/connector/skos_parser.rb | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb b/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb index 9f13e68c60..21da91b2a7 100644 --- a/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb +++ b/engines/dfc_provider/lib/data_food_consortium/connector/importer.rb @@ -130,8 +130,8 @@ module DataFoodConsortium "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/measures.rdf#", "dfc-m:" ).sub( - "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#", - "dfc-pt:" + "dfc-pt:", + "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#" ) SKOSParser.concepts[id] diff --git a/engines/dfc_provider/lib/data_food_consortium/connector/skos_parser.rb b/engines/dfc_provider/lib/data_food_consortium/connector/skos_parser.rb index 3dc4675e35..dda1422ac2 100644 --- a/engines/dfc_provider/lib/data_food_consortium/connector/skos_parser.rb +++ b/engines/dfc_provider/lib/data_food_consortium/connector/skos_parser.rb @@ -90,13 +90,8 @@ module DataFoodConsortium prefLabels: element.label ) skosConcept.semanticType = element.type - # Gaetan's fix for productTypes - id = element.id.sub( - "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#", - "dfc-pt:" - ) # Maikel's patch - self.class.concepts[id] = skosConcept + self.class.concepts[element.id] = skosConcept skosConcept end