Skip to content

weko#50587 fix import issue #1601

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

Open
wei-kuochen wants to merge 2 commits into
base: develop_v1.0.10
Choose a base branch
from
Open

weko#50587 fix import issue #1601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b1f4ce
weko#50587 fix import issue
wei-kuochen Feb 25, 2025
3ca788a
weko#50587 fix import issue
wei-kuochen Feb 26, 2025
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
29 changes: 22 additions & 7 deletions modules/weko-search-ui/weko_search_ui/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,10 +869,12 @@ def handle_validate_item_import(list_record, schema) -> list:
for record in list_record:
errors = record.get("errors") or []
record_id = record.get("id")
if record_id and (
not represents_int(record_id) or re.search(r"([０-９])", record_id)
):
errors.append(_("Please specify item ID by half-width number."))
if record_id:
if not represents_int(record_id) or re.search(r"([０-９])", record_id):
record["id"] = ""
errors.append(_("Please specify item ID by half-width number."))
else:
record["id"] = str(int(record_id))
if record.get("metadata"):
if v2:
a = v2.iter_errors(record.get("metadata"))
Expand Down Expand Up @@ -1742,7 +1744,11 @@ def check(index_id, index_name_path):
"""
temp_res = []
index_info = None
index_info = Indexes.get_path_list([index_id])
try:
index_info = Indexes.get_path_list([str(int(index_id))])
except Exception as ex:
current_app.logger.error(ex)
db.session.rollback()

msg_not_exist = _("The specified {} does not exist in system.")
if index_info and len(index_info) == 1:
Expand Down Expand Up @@ -1981,7 +1987,12 @@ def handle_check_doi_indexes(list_record):
if doi_ra and publish_status == WEKO_IMPORT_PUBLISH_STATUS[1]:
errors.append(_("You cannot keep an item private because it has a DOI."))
# Check restrict DOI with Indexes:
index_ids = [str(idx) for idx in item["metadata"].get("path", [])]
index_ids = []
try:
index_ids = [str(int(idx)) for idx in item["metadata"].get("path", [])]
except Exception as ex:
current_app.logger.error(ex)
db.session.rollback()
if doi_ra and check_restrict_doi_with_indexes(index_ids):
if not item.get("status") or item.get("status") == "new":
errors.append(err_msg_register_doi)
Expand Down Expand Up @@ -2931,7 +2942,11 @@ def recursive_sub(keys, node, uri_key, current_type):
item_doi_prefix = item_doi

item_doi_ra = item.get("doi_ra","")
item_id = item.get('id',"")
item_id = ""
try:
item_id = int(item.get('id'))
except Exception as ex:
current_app.logger.error(ex)
checked_registerd_doi_ra = False
existed_doi = False

Expand Down
Loading