Handle multiple Subcard levels in Search Export. #10199 #10214
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@chiatt reassign as required |
chiatt
requested changes
Nov 9, 2023
arches/app/search/search_export.py
Outdated
Comment on lines
96
to
109
| self.insert_subcard_below_parent_card(sorted_card_list, card_list_no_sort) | ||
| # Loop down through the levels of subcards, 'till no more sub-levels may be added. | ||
| subcards_added = [True] | ||
| while subcards_added[0]: | ||
| subcards_added = [False] | ||
| self.insert_subcard_below_parent_card(sorted_card_list, card_list_no_sort, subcards_added) | ||
|
|
||
| # Cards in subcard_list_with_sort are added after cards with no sort | ||
| # Cards in subcard_list_with_sort are added after cards with no sort | ||
|
|
||
| self.insert_subcard_below_parent_card(sorted_card_list, subcard_list_with_sort) | ||
| self.insert_subcard_below_parent_card(sorted_card_list, subcard_list_with_sort, subcards_added) |
There was a problem hiding this comment.
@khodgkinson-he This works like a charm, but just be consistent with other parts of Arches, could you change this to use recursion rather than a while loop? Something like this should work:
def order_cards(subcards_added=True):
if subcards_added == True:
subcards_added = False
unsorted_subcards_added = self.insert_subcard_below_parent_card(sorted_card_list, card_list_no_sort, subcards_added)
sorted_subcards_added = self.insert_subcard_below_parent_card(sorted_card_list, subcard_list_with_sort, unsorted_subcards_added)
order_cards(sorted_subcards_added)
order_cards()
With that change you would need to change line 71 to subcards_added = True and then add a return statement to line 74, return subcards_added
There was a problem hiding this comment.
@chiatt Glad you like.. ^_^
I've refactored that as an inline function as recommended, any issues please let me know!
chiatt
approved these changes
Nov 14, 2023
chiatt
added a commit
that referenced
this pull request
Nov 27, 2023
) * Itterate through subcards to terminus. * Amended to use inline fn. Co-authored-by: Kingsley <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Types of changes
Description of Change
In the example below, I am attempting to nest:
Discovery
└─> Location Data
____└─>Geometry
However as Geometry Card is processed before it's parent Location Data Card is added, it can never be appended..
To address this I have introduced a loop whilst sub-cards have been added to the main card list, to check if they have sub-cards in turn.
Issues Solved
#10199
Further comments
This is likely an historical remnant of when Arches only allowed sub-cards nested two levels deep.