From 4e45429796c616ab99cddbc989107ab26e97387a Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 1 Dec 2017 12:32:51 +0000 Subject: [PATCH] ignore tags longer than 100 chars git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@158989 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 +++ .../grsf_publish_ws/utils/CommonServiceUtils.java | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 6caf699..396fdd0 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -3,6 +3,9 @@ + + uses + diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java index 2666cf0..9a33a88 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java @@ -49,6 +49,7 @@ import eu.trentorise.opendata.jackan.model.CkanLicense; public class CommonServiceUtils { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CommonServiceUtils.class); + private static final int TAG_MAX_SIZE = 100; /** * Retrieve the list of licenses for stocks and fisheries @@ -183,13 +184,15 @@ public class CommonServiceUtils { elementsToConsider = Math.min(elementsToConsider, Constants.TIME_SERIES_TAKE_LAST_VALUES); for (int i = (asList.size() - elementsToConsider); i < asList.size(); i++) { String finalTag = asList.get(i).toString().trim().replaceAll(Constants.REGEX_TAGS, ""); - tags.add(finalTag); + if(finalTag.length() <= TAG_MAX_SIZE) + tags.add(finalTag); } }else{ // else add all the available elements for (int i = 0; i < elementsToConsider; i++) { String finalTag = asList.get(i).toString().trim().replaceAll(Constants.REGEX_TAGS, ""); - tags.add(finalTag); + if(finalTag.length() <= TAG_MAX_SIZE) + tags.add(finalTag); } } } @@ -197,7 +200,8 @@ public class CommonServiceUtils { logger.debug("The object annotated with @Tag is a simple one. Adding ... "); String finalTag = f.toString().trim().replaceAll(Constants.REGEX_TAGS, ""); logger.debug(finalTag); - tags.add(finalTag); + if(finalTag.length() <= TAG_MAX_SIZE) + tags.add(finalTag); } } @@ -433,7 +437,7 @@ public class CommonServiceUtils { CommonServiceUtils.validateAggregatedRecord(record); } } - + // set the domain record.setDomain(productType.getOrigName()); @@ -490,7 +494,7 @@ public class CommonServiceUtils { return systemTypeValue; } - + public static String getRecordOrganization(String itemIdOrName, String apiKey, String context) throws Exception{ DataCatalogue catalog = HelperMethods.getDataCatalogueRunningInstance(context); CkanDataset dataset = catalog.getDataset(itemIdOrName, apiKey);