diff --git a/src/app/mapping/class/dataset.ts b/src/app/mapping/class/dataset.ts index 51c1cd9cd895c3a131784baedaa66b72324873b9..f1e198cceed173236101d580a585bf7d57a7cb7f 100644 --- a/src/app/mapping/class/dataset.ts +++ b/src/app/mapping/class/dataset.ts @@ -60,7 +60,7 @@ export class Distribution { } export class ResponseFileTsv { - public subject_id: string; + public subject_label: string; public predicat_id: string; public object_id: string; public match_type: string; diff --git a/src/app/mapping/mapping.component.ts b/src/app/mapping/mapping.component.ts index 62b94148c891dba8fb7c270650947c37b5e5cb4b..2116435c639857710464bdeb53df7382f7e2357e 100644 --- a/src/app/mapping/mapping.component.ts +++ b/src/app/mapping/mapping.component.ts @@ -485,11 +485,11 @@ export class MappingComponent implements OnInit, OnDestroy { const voc: Property = vocabulary.find(e => e.uri === tsvFile[i].object_id); const index = vocabulary.indexOf(voc); vocabulary.splice(index + 1, 0, voc); - paths.splice(index + 1, 0, tsvFile[i].subject_id); + paths.splice(index + 1, 0, tsvFile[i].subject_label); } else { const voc: Property = vocabulary.find(e => e.uri === tsvFile[i].object_id); const index = vocabulary.indexOf(voc); - paths[index] = tsvFile[i].subject_id; + paths[index] = tsvFile[i].subject_label; } } } @@ -556,6 +556,7 @@ export class MappingComponent implements OnInit, OnDestroy { paths.splice(index + 1, 0, ''); + } deleteField(index: number, properties: Property[], paths: string[]) { diff --git a/src/app/mapping/service/mapping.service.ts b/src/app/mapping/service/mapping.service.ts index 8e3b0dbdd7ec53bd2e7b9c1ff5a9ecd2a965188b..e1c82833a4a1a60baf19b70dcee6e451e8e41551 100644 --- a/src/app/mapping/service/mapping.service.ts +++ b/src/app/mapping/service/mapping.service.ts @@ -26,7 +26,7 @@ export class MappingService { const body: Blob = new Blob(['\ufeff' + this.convertToTSV(objArray, [ - 'subject_id', + 'subject_label', 'predicate_id', 'object_id', 'match_type', @@ -53,7 +53,7 @@ export class MappingService { downloadFile(data: DatasetPath[], filename = 'dcatMapping') { let tsvData = this.convertToTSV(data, [ - 'subject_id', + 'subject_label', 'predicate_id', 'object_id', 'match_type', @@ -81,7 +81,7 @@ export class MappingService { let date = new Date(); let user: SmartHarvesterUser = this.storageService.getUser(); let array = typeof objArray != 'object' ? JSON.parse(objArray) : objArray; - let str = `#mapping_date: ${date.getDate()}/${date.getMonth()}/${date.getFullYear()}\n#creator_label: ${user.firstName} ${user.lastName}\n`; + let str = `#mapping_date: ${date.getDate()}/${date.getMonth()}/${date.getFullYear()}\n#creator_label: ${user.firstName} ${user.lastName}\n#curie_map:\n# dcat: "http://www.w3.org/ns/dcat#"\n# dct: "http://purl.org/dc/terms/"\n# adms: "http://www.w3.org/ns/adms#\n# dqv: "http://www.w3.org/ns/dqv#"\n# geodcat: "http://data.europa.eu/930/"\n# prov: "http://www.w3.org/ns/prov#"\n# rdfs: "http://www.w3.org/2000/01/rdf-schema#"`; let row = ''; for (let index in headerList) { @@ -96,7 +96,7 @@ export class MappingService { for (let index in headerList) { let head = headerList[index]; switch (head) { - case 'subject_id': + case 'subject_label': line += array[i].path + '\t'; break; case 'predicate_id':