From 054eb0037fe671e03c951f12f572d13e4e8b4c61 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 13 Jun 2024 06:54:48 +0000
Subject: [PATCH] Dev
---
.../src/main/java/at/tuwien/mapper/MetadataMapper.java | 5 +++--
.../java/at/tuwien/mapper/MetadataMapperUnitTest.java | 8 ++++----
.../java/at/tuwien/service/TableServiceUnitTest.java | 2 +-
.../java/at/tuwien/service/impl/TableServiceImpl.java | 1 -
dbrepo-ui/pages/database/[database_id]/table/import.vue | 9 ++++-----
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index bb355f02c4..8e628f710a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -829,8 +829,9 @@ public interface MetadataMapper {
final Pattern WHITESPACE = Pattern.compile("[\\s]");
String nowhitespace = WHITESPACE.matcher(data).replaceAll("_");
String normalized = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD);
- String slug = NONLATIN.matcher(normalized).replaceAll("");
- final String name = slug.toLowerCase(Locale.ENGLISH);
+ String slug = NONLATIN.matcher(normalized).replaceAll("_");
+ final String name = slug.toLowerCase(Locale.ENGLISH)
+ .replaceAll("-", "_");
log.debug("mapping name {} to internal name {}", data, name);
return name;
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
index c357020a68..732c11124f 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
@@ -398,10 +398,10 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
public static Stream<Arguments> nameToInternalName_parameters() {
return Stream.of(
- Arguments.arguments("dash_minus", "OE/NO-027", "oeno-027"),
- Arguments.arguments("percent", "OE%NO-027", "oeno-027"),
- Arguments.arguments("umlaut", "OE/NÖ-027", "oeno-027"),
- Arguments.arguments("dot", "OE.NO-027", "oeno-027")
+ Arguments.arguments("dash_minus", "OE/NO-027", "oe_no_027"),
+ Arguments.arguments("percent", "OE%NO-027", "oe_no_027"),
+ Arguments.arguments("umlaut", "OE/NÖ-027", "oe_no__027"),
+ Arguments.arguments("dot", "OE.NO-027", "oe_no_027")
);
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index c16a4191f9..d32189f944 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -184,7 +184,7 @@ public class TableServiceUnitTest extends AbstractUnitTest {
assertTrue(column0.getAutoGenerated());
final TableColumn column1 = response.getColumns().get(1);
assertEquals("I Am Späshül", column1.getName());
- assertEquals("i_am_spashul", column1.getInternalName());
+ assertEquals("i_am_spa_shu_l", column1.getInternalName());
assertEquals(TableColumnType.TEXT, column1.getColumnType());
assertTrue(column1.getIsNullAllowed());
assertFalse(column1.getAutoGenerated());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index e8fecdf300..593b612a9c 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -19,7 +19,6 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.mapper.SparqlMapper;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.service.*;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-ui/pages/database/[database_id]/table/import.vue b/dbrepo-ui/pages/database/[database_id]/table/import.vue
index 724205c7ba..07e56afea3 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/import.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/import.vue
@@ -325,10 +325,9 @@ export default {
this.table = table
resolve(table)
})
- .catch((error) => {
- console.error('Failed to create table', error)
+ .catch(({code, message}) => {
const toast = useToastInstance()
- toast.error(this.$t(error.code))
+ toast.error(`${this.$t(code)}: ${message}`)
this.loading = false
reject(error)
})
@@ -347,10 +346,10 @@ export default {
toast.success(this.$t('success.import.dataset'))
this.cacheStore.reloadDatabase()
})
- .catch(({code}) => {
+ .catch(({code, message}) => {
console.error('Failed to import csv')
const toast = useToastInstance()
- toast.error(this.$t(code))
+ toast.error(`${this.$t(code)}: ${message}`)
this.loading = false
})
.finally(() => {
--
GitLab