Skip to content

Commit 29a2708

Browse files
committed
feat: separators for controlled parameters and grand chalenges
1 parent 40dcef3 commit 29a2708

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

server/workers/common/common/aquanavi/mapping.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,14 @@ def get_abstract(row):
204204
str: String in the abstract field format.
205205
"""
206206
AMOUNT_OF_ALL_POSSIBLE_ENTRIES = 5
207-
JOIN_PARTS_OF_VALUES_WITH = " "
207+
JOIN_PARTS_WITH = {
208+
"description": " ",
209+
"equipment": " ",
210+
"controlled_parameters": "; ",
211+
"grand_challenges": "; ",
212+
"research_topics": " ",
213+
}
214+
208215
count_of_not_available_parts = 0
209216
abstract_parts = []
210217

@@ -214,27 +221,27 @@ def get_not_available_message_and_increase_counter(name):
214221
return f"{name}: description not available"
215222

216223
if (row[COLUMNS['description']]):
217-
abstract_parts.append(f"Facility description: {get_and_process_value(row, COLUMNS['description'], True, JOIN_PARTS_OF_VALUES_WITH)}")
224+
abstract_parts.append(f"Facility description: {get_and_process_value(row, COLUMNS['description'], True, JOIN_PARTS_WITH['description'])}")
218225
else:
219226
abstract_parts.append(get_not_available_message_and_increase_counter("Facility description"))
220227

221228
if (row[COLUMNS['equipment']]):
222-
abstract_parts.append(f"Equipment: {get_and_process_value(row, COLUMNS['equipment'], True, JOIN_PARTS_OF_VALUES_WITH)}")
229+
abstract_parts.append(f"Equipment: {get_and_process_value(row, COLUMNS['equipment'], True, JOIN_PARTS_WITH['equipment'])}")
223230
else:
224231
abstract_parts.append(get_not_available_message_and_increase_counter('Equipment'))
225232

226233
if (row[COLUMNS['controlled_parameters']]):
227-
abstract_parts.append(f"Controlled parameters: {get_and_process_value(row, COLUMNS['controlled_parameters'], True, JOIN_PARTS_OF_VALUES_WITH)}")
234+
abstract_parts.append(f"Controlled parameters: {get_and_process_value(row, COLUMNS['controlled_parameters'], True, JOIN_PARTS_WITH['controlled_parameters'])}")
228235
else:
229236
abstract_parts.append(get_not_available_message_and_increase_counter('Controlled Parameters'))
230237

231238
if (row[COLUMNS['grand_challenges']]):
232-
abstract_parts.append(f"Grand challenges: {get_and_process_value(row, COLUMNS['grand_challenges'], True, JOIN_PARTS_OF_VALUES_WITH)}")
239+
abstract_parts.append(f"Grand challenges: {get_and_process_value(row, COLUMNS['grand_challenges'], True, JOIN_PARTS_WITH['grand_challenges'])}")
233240
else:
234241
abstract_parts.append(get_not_available_message_and_increase_counter('Grand challenges'))
235242

236243
if (row[COLUMNS['research_topics']]):
237-
abstract_parts.append(f"Research topics: {get_and_process_value(row, COLUMNS['research_topics'], True, JOIN_PARTS_OF_VALUES_WITH)}")
244+
abstract_parts.append(f"Research topics: {get_and_process_value(row, COLUMNS['research_topics'], True, JOIN_PARTS_WITH['research_topics'])}")
238245
else:
239246
abstract_parts.append(get_not_available_message_and_increase_counter('Research topics'))
240247

0 commit comments

Comments
 (0)