MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix freetext-format bug in prefilling temporarily

This commit is contained in:
Bernaldo Mihasi 2022-02-11 13:09:29 +02:00
parent 26e10b1299
commit eedcf0dfb0
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
View File

@ -390,6 +390,7 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
} }
formats = formats.stream().distinct().collect(Collectors.toList()); formats = formats.stream().distinct().collect(Collectors.toList());
List<Object> standardFormats = new ArrayList<>(); List<Object> standardFormats = new ArrayList<>();
StringBuilder freeTextFormat = new StringBuilder();
for(String format: formats) { for(String format: formats) {
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
String parsedUrl = "https://eestore.paas2.uninett.no/api/fileformat/?search=" + format; String parsedUrl = "https://eestore.paas2.uninett.no/api/fileformat/?search=" + format;
@ -398,6 +399,7 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
HttpEntity<String> entity = new HttpEntity("", headers); HttpEntity<String> entity = new HttpEntity("", headers);
Map<String, Object> data = restTemplate.exchange(parsedUrl, HttpMethod.GET, entity, LinkedHashMap.class).getBody(); Map<String, Object> data = restTemplate.exchange(parsedUrl, HttpMethod.GET, entity, LinkedHashMap.class).getBody();
jsonArr = new JSONArray(new ObjectMapper().writeValueAsString(data.get("data"))); jsonArr = new JSONArray(new ObjectMapper().writeValueAsString(data.get("data")));
if(jsonArr.length() > 0) {
for (int i = 0; i < jsonArr.length(); i++) { for (int i = 0; i < jsonArr.length(); i++) {
JSONObject jsonObj = jsonArr.getJSONObject(i); JSONObject jsonObj = jsonArr.getJSONObject(i);
jsonObj = jsonObj.getJSONObject("attributes"); jsonObj = jsonObj.getJSONObject("attributes");
@ -417,10 +419,23 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
break; break;
} }
} }
}
else{
freeTextFormat.append(format).append(", ");
}
} }
String renderStyle = node.get(0) != null ? node.get(0).get("viewStyle").get("renderStyle").asText() : node.get("viewStyle").get("renderStyle").asText();
if(renderStyle.equals("freetext")){
if (freeTextFormat.length() > 0) {
freeTextFormat.setLength(freeTextFormat.length() - 2);
}
properties.put(id, freeTextFormat.toString());
}
else{
properties.put(id, standardFormats); properties.put(id, standardFormats);
} }
}
else if(prefillingMapping.getMaDmpTarget().equals("dataset.distribution.data_access")){ else if(prefillingMapping.getMaDmpTarget().equals("dataset.distribution.data_access")){
value = value.replace("\"", ""); value = value.replace("\"", "");
if(value.equals("open")){ if(value.equals("open")){