Skip to content

Feature/ams w2025 66a 4 change domain #1825

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

Draft
ivis-futagami wants to merge 2 commits into
base: feature/ams_w2025_66a_base
Choose a base branch
from
Draft

Feature/ams w2025 66a 4 change domain #1825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653130c
ワーニングが上書きされる不具合解消、_未定義エラーになる現象解消
ayumi-nishida Feb 19, 2026
fd88ba6
Merge remote-tracking branch 'nishdia/fix/handle_update_warning' into…
ivis-futagami Feb 26, 2026
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
12 changes: 7 additions & 5 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 @@ -931,7 +931,7 @@ def check_jsonld_import_items(
with open(f"{data_path}/{json_name}", "r") as f:
json_ld = json.load(f)
mapper.data_path = data_path
item_metadatas, _ = mapper.to_item_metadata(json_ld)
item_metadatas, x = mapper.to_item_metadata(json_ld)
list_record = [
{
"$schema": f"/items/jsonschema/{item_type.id}",
Expand Down Expand Up @@ -1447,7 +1447,8 @@ def handle_validate_item_import(list_record, schema) -> list:
v2 = Draft4Validator(schema) if schema else None
for record in list_record:
errors = record.get("errors") or []
warnings = []
new_warnings = []
warnings = record.get("warnings") or []
record_id = record.get("id")
if record_id and (
not represents_int(record_id) or re.search(r"([０-９])", record_id)
Expand All @@ -1472,7 +1473,7 @@ def handle_validate_item_import(list_record, schema) -> list:
last_key = path_list[-1]
target[last_key] = str(target[last_key])
target_path = ".".join([str(p) for p in path_list[:-2]])
warnings.append(
new_warnings.append(
_("Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'.",
target_path=target_path, old_value=target[last_key], new_value=str(target[last_key])
)
Expand All @@ -1490,13 +1491,14 @@ def handle_validate_item_import(list_record, schema) -> list:

records = dict(**record)
records["errors"] = errors if len(errors) else None
if len(warnings) > 0:
if len(new_warnings) > 0:
warnings.append(
_("Specified %(type)s is different from existing %(existing_type)s.",
type="type:integer", existing_type="type:string"
)
)
records["warnings"] = warnings if len(warnings) else None
warnings.extend(new_warnings)
records["warnings"] = warnings
result.append(records)

return result
Expand Down
Loading