Skip to content

weko#45046 fix custom sort setting #1554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivis-kondo merged 1 commit into from
Apr 7, 2025
Merged

weko#45046 fix custom sort setting #1554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/weko-search-ui/weko_search_ui/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ def get(self, **kwargs):
nlst.append(current_idx)
agp.clear()
# process index tree image info
custom_sort_data = None
if len(nlst):
index_id = nlst[0].get("key").split("/")[-1]
index_info = Indexes.get_index(index_id=index_id)
Expand All @@ -376,11 +377,15 @@ def get(self, **kwargs):
nlst[0]["img"] = index_info.image_name
nlst[0]["display_format"] = index_info.display_format
nlst[0]["rss_status"] = index_info.rss_status
if index_id == q:
custom_sort_data = index_info
# Update rss_status for index child
for idx in range(0, len(nlst)):
index_id = nlst[idx].get("key").split("/")[-1]
index_info = Indexes.get_index(index_id=index_id)
nlst[idx]["rss_status"] = index_info.rss_status
if index_id == q:
custom_sort_data = index_info
agp.append(nlst)
for hit in rd["hits"]["hits"]:
try:
Expand All @@ -390,9 +395,9 @@ def get(self, **kwargs):
hit["_source"]["_comment"] = _comment
# Register custom_sort
cn = hit["_source"]["control_number"]
if index_info.item_custom_sort.get(cn):
if custom_sort_data and custom_sort_data.item_custom_sort.get(cn):
hit["_source"]["custom_sort"] = {
str(index_info.id): str(index_info.item_custom_sort.get(cn))
str(custom_sort_data.id): str(custom_sort_data.item_custom_sort.get(cn))
}
except Exception:
pass
Expand Down