-
-
-{{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }}
-
{{ _('Authorize application') }}
-
{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your '%(current_user)s' account.",
- client_name=client.name, client_user=client.user.nickname or client.user.email, current_user=current_user.nickname or current_user.email) }}
-
-
-
-
+
+
+ {{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }}
+
{{ _('Authorize application') }}
+
{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your
+ '%(current_user)s' account.",
+ client_name=client.name, client_user=client.user.nickname or client.user.email,
+ current_user=current_user.nickname or current_user.email) }}
+
+
+
+
-
{{ _('Review permissions') }}
- {%- for group in scopes|groupby('group') %}
- {%- if loop.first %}
{% endif %}
-
- {{group.grouper}} {% for scope in group.list %}{{scope.help_text}} {% endfor %}
- {%- if loop.last %}
{% endif %}
- {%- else %}
-
No permissions granted.
- {%- endfor %}
-
-
-
-
-
-
{{ _('Application') }}
-
{{client.name}}
- {%- if client.description %}
{{client.description}}
{% endif %}
- {%- if client.website %}
{{ _('Visit application website') }}
{% endif %}
-
-
-
+
{{ _('Review permissions') }}
+ {%- for group in scopes|groupby('group') %}
+ {%- if loop.first %}
+ {% endif %}
+
+ {{group.grouper}}
+ {% for scope in group.list %}{{scope.help_text}} {% endfor %}
+
+
+ {%- if loop.last %}
+
+
{% endif %}
+ {%- else %}
+
{{ _("No permissions granted.") }}
+ {%- endfor %}
+
+
+
+
+
+
{{ _('Application') }}
+
{{client.name}}
+ {%- if client.description %}
{{client.description}}
{% endif %}
+ {%- if client.website %}
{{ _("Visit application website") }}
{%
+ endif %}
+
+
+
+
+
+
+
+
+
+
+
+ {{ helpers.panel_end() }}
+
-
-
-
-
-
-
-
-{{ helpers.panel_end() }}
-
-
{% endblock %}
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html
index 13cea2a2d6..d2380e73ad 100644
--- a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html
+++ b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html
@@ -3,8 +3,8 @@
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
- Invenio is free software; you can redistribute it and/or modify it
- under the terms of the MIT License; see LICENSE file for more details.
+Invenio is free software; you can redistribute it and/or modify it
+under the terms of the MIT License; see LICENSE file for more details.
#}
{%- extends config.OAUTH2SERVER_COVER_TEMPLATE %}
@@ -14,24 +14,36 @@
{%- block page_body %}
- {{ helpers.panel_start(
+ {{ helpers.panel_start(
_('Invalid authorization request'),
icon='fa fa-warning fa-fw'
- ) }}
-
- {{ _('Invalid authorization request') }}
-
- {{ _('The service that redirected your here made an invalid authorization request (error code: %(x_error)s).',
- x_error=error.error) }}
-
-
-
-
-
- {{ _('Get me out of here!') }}
-
+ ) }}
+
+
+ {{ _('You cannot access the service because there is an error in the authentication request.') }}
+ {% if error.error == unsupported_response_type %}
+ ({{ _('unsupported_response_type') }})
+ {% elif error.error == 'invalid_request' %}
+ {% if error.description is string and 'client_id' in error.description %}
+ ({{ _('invalid_client_id') }})
+ {% else %}
+ ({{ _('invalid_request') }})
+ {% endif %}
+ {% elif error.error == 'invalid_scope' %}
+ ({{ _('invalid_scope')}})
+ {% elif error.error == 'access_denied' %}
+ ({{ _('access_denied') }})
+ {% endif %}
+
+
+
+
+
+ {{ helpers.panel_end() }}
- {{ helpers.panel_end() }}
-
-{%- endblock %}
+ {%- endblock %}
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo
index 37cc8629ab..ddda3415eb 100644
Binary files a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo and b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po
index 0906c42036..bd5a324cfb 100644
--- a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po
+++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: invenio-oauth2server 1.0.0\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
-"POT-Creation-Date: 2025-10-03 14:53+0900\n"
+"POT-Creation-Date: 2025-12-17 12:38+0900\n"
"PO-Revision-Date: 2025-05-07 18:18+0900\n"
"Last-Translator: FULL NAME
\n"
"Language: en\n"
@@ -112,8 +112,8 @@ msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58
-#: invenio_oauth2server/views/server.py:69
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67
+#: invenio_oauth2server/views/server.py:71
msgid "Authorize application"
msgstr ""
@@ -121,41 +121,64 @@ msgstr ""
#, python-format
msgid ""
"Application '%(client_name)s' by '%(client_user)s' wants permission to "
-"access your '%(current_user)s' account."
+"access your\n"
+" '%(current_user)s' account."
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29
msgid "Review permissions"
msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43
+msgid "No permissions granted."
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43
msgid "Application"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46
msgid "Visit application website"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69
msgid "Reject"
msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22
msgid "Invalid authorization request"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24
-#, python-format
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23
msgid ""
-"The service that redirected your here made an invalid authorization "
-"request (error code: %(x_error)s)."
+"You cannot access the service because there is an error in the "
+"authentication request."
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25
+msgid "unsupported_response_type"
+msgstr "error: This response type is not supported."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28
+msgid "invalid_client_id"
+msgstr "error: The client ID is incorrect."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30
+msgid "invalid_request"
+msgstr "error: The request is invalid."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33
+msgid "invalid_scope"
+msgstr "error: The scope is incorrect."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35
+msgid "access_denied"
+msgstr "error: Access has been denied."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43
msgid "Get me out of here!"
msgstr ""
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo
index d9eceed768..29454e17ea 100644
Binary files a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo and b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po
index 2e6ae3943b..a5c11db316 100644
--- a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po
+++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: invenio-oauth2server 1.0.0\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
-"POT-Creation-Date: 2025-10-03 14:53+0900\n"
+"POT-Creation-Date: 2025-12-17 12:38+0900\n"
"PO-Revision-Date: 2025-05-07 18:18+0900\n"
"Last-Translator: FULL NAME \n"
"Language: ja\n"
@@ -112,50 +112,73 @@ msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58
-#: invenio_oauth2server/views/server.py:69
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67
+#: invenio_oauth2server/views/server.py:71
msgid "Authorize application"
-msgstr ""
+msgstr "アプリの使用を承諾する"
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:20
#, python-format
msgid ""
"Application '%(client_name)s' by '%(client_user)s' wants permission to "
-"access your '%(current_user)s' account."
-msgstr ""
+"access your\n"
+" '%(current_user)s' account."
+msgstr "「%(client_user)s」による「%(client_name)s」アプリケーションがあなたのアカウントへのアクセス許可を求めています。"
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29
msgid "Review permissions"
-msgstr ""
+msgstr "権限を確認"
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43
+msgid "No permissions granted."
+msgstr "権限が付与されていません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43
msgid "Application"
-msgstr ""
+msgstr "アプリケーション"
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46
msgid "Visit application website"
-msgstr ""
+msgstr "アプリケーションのウェブサイト閲覧"
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69
msgid "Reject"
-msgstr ""
+msgstr "拒否"
#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22
msgid "Invalid authorization request"
-msgstr ""
+msgstr "無効な認証リクエスト"
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24
-#, python-format
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23
msgid ""
-"The service that redirected your here made an invalid authorization "
-"request (error code: %(x_error)s)."
-msgstr ""
+"You cannot access the service because there is an error in the "
+"authentication request."
+msgstr "認証リクエストに誤りがあるため、アクセスできません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25
+msgid "unsupported_response_type"
+msgstr "エラー: このレスポンスタイプはサポートされていません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28
+msgid "invalid_client_id"
+msgstr "エラー: クライアントIDに誤りがあります。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30
+msgid "invalid_request"
+msgstr "エラー: 無効なリクエストです。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33
+msgid "invalid_scope"
+msgstr "エラー: スコープに誤りがあります。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35
+msgid "access_denied"
+msgstr "エラー: アクセスが拒否されました。"
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43
msgid "Get me out of here!"
msgstr ""
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot b/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot
index 92fb442353..2a2a8546ab 100644
--- a/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot
+++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: invenio-oauth2server 1.0.0\n"
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
-"POT-Creation-Date: 2025-10-03 14:53+0900\n"
+"POT-Creation-Date: 2025-12-17 12:38+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -111,8 +111,8 @@ msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58
-#: invenio_oauth2server/views/server.py:69
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67
+#: invenio_oauth2server/views/server.py:71
msgid "Authorize application"
msgstr ""
@@ -120,41 +120,64 @@ msgstr ""
#, python-format
msgid ""
"Application '%(client_name)s' by '%(client_user)s' wants permission to "
-"access your '%(current_user)s' account."
+"access your\n"
+" '%(current_user)s' account."
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29
msgid "Review permissions"
msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43
+msgid "No permissions granted."
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43
msgid "Application"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53
#: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46
msgid "Visit application website"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69
msgid "Reject"
msgstr ""
#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22
msgid "Invalid authorization request"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24
-#, python-format
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23
msgid ""
-"The service that redirected your here made an invalid authorization "
-"request (error code: %(x_error)s)."
+"You cannot access the service because there is an error in the "
+"authentication request."
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25
+msgid "unsupported_response_type"
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28
+msgid "invalid_client_id"
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30
+msgid "invalid_request"
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33
+msgid "invalid_scope"
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35
+msgid "access_denied"
msgstr ""
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43
msgid "Get me out of here!"
msgstr ""
diff --git a/modules/invenio-oauth2server/invenio_oauth2server/views/server.py b/modules/invenio-oauth2server/invenio_oauth2server/views/server.py
index 5e59143bb1..066c560b68 100644
--- a/modules/invenio-oauth2server/invenio_oauth2server/views/server.py
+++ b/modules/invenio-oauth2server/invenio_oauth2server/views/server.py
@@ -13,12 +13,14 @@
from functools import wraps
from flask import Blueprint, _request_ctx_stack, abort, current_app, jsonify, \
- redirect, render_template, request, session
+ redirect, render_template, request, make_response
from flask_babelex import lazy_gettext as _
from flask_breadcrumbs import register_breadcrumb
from flask_login import login_required
from flask_principal import Identity, identity_changed
-from oauthlib.oauth2.rfc6749.errors import InvalidClientError, OAuth2Error
+from oauthlib.oauth2.rfc6749.errors import InvalidClientError, OAuth2Error, \
+ AccessDeniedError, raise_from_error
+
from invenio_db import db
from ..models import Client
@@ -81,10 +83,14 @@ def authorize(*args, **kwargs):
abort(404)
scopes = current_oauth2server.scopes
+ scopes_list = [scopes[x] for x in kwargs.get('scopes', [])]
+ if not scopes_list:
+ return redirect('/oauth/errors?error=invalid_scope')
+
ctx = dict(
client=client,
oauth_request=kwargs.get('request'),
- scopes=[scopes[x] for x in kwargs.get('scopes', [])],
+ scopes=scopes_list
)
return render_template('invenio_oauth2server/authorize.html', **ctx)
@@ -120,14 +126,22 @@ def access_token():
@blueprint.route('/errors')
def errors():
"""Error view in case of invalid oauth requests."""
- from oauthlib.oauth2.rfc6749.errors import raise_from_error
+ status_code = 200
try:
error = None
- raise_from_error(request.values.get('error'), params=dict())
+ error_code = request.values.get('error')
+ description = request.values.get('error_description')
+ params = {}
+ if description:
+ params['error_description'] = description
+
+ raise_from_error(error_code, params=params)
except OAuth2Error as raised:
error = raised
- return render_template('invenio_oauth2server/errors.html', error=error)
-
+ if not isinstance(error, AccessDeniedError):
+ status_code = 400
+ response = make_response(render_template('invenio_oauth2server/errors.html', error=error), status_code)
+ return response
@blueprint.route('/ping', methods=['GET', 'POST'])
@oauth2.require_oauth()
@@ -163,10 +177,11 @@ def invalid():
@blueprint.teardown_request
def dbsession_clean(exception):
+ """Clean up the database session after each request."""
current_app.logger.debug("invenio_oauth2server dbsession_clean: {}".format(exception))
if exception is None:
try:
db.session.commit()
except:
db.session.rollback()
- db.session.remove()
\ No newline at end of file
+ db.session.remove()
diff --git a/modules/invenio-oauth2server/tests/conftest.py b/modules/invenio-oauth2server/tests/conftest.py
index 05e8fd0860..b7f35001ae 100644
--- a/modules/invenio-oauth2server/tests/conftest.py
+++ b/modules/invenio-oauth2server/tests/conftest.py
@@ -314,10 +314,20 @@ def provider_fixture(app):
'oauth2test.authorized', _external=True
),
_default_scopes='email')
+ c5 = Client(client_id='no-scopes',
+ client_secret='no-scopes',
+ name='no-scopes',
+ description='',
+ is_confidential=False,
+ user=user1,
+ _redirect_uris=url_for(
+ 'oauth2test.authorized', _external=True
+ ))
db.session.add(c1)
db.session.add(c2)
db.session.add(c3)
db.session.add(c4)
+ db.session.add(c5)
personal_token = Token.create_personal('test-personal',
user1.id,
scopes=[],
diff --git a/modules/invenio-oauth2server/tests/test_provider.py b/modules/invenio-oauth2server/tests/test_provider.py
index ab4963ffab..117d524668 100644
--- a/modules/invenio-oauth2server/tests/test_provider.py
+++ b/modules/invenio-oauth2server/tests/test_provider.py
@@ -136,7 +136,7 @@ def test_invalid_authorize_requests(provider_fixture):
assert error_url in next_url
r = client.get(next_url, query_string=data)
- assert 'invalid_request' in str(r.data)
+ assert 'an error in the authentication request' in str(r.data)
# Invalid redirect uri
r = client.get(url_for(
@@ -151,6 +151,27 @@ def test_invalid_authorize_requests(provider_fixture):
assert data['error'] == 'invalid_request'
assert error_url in next_url
+ for client_id in ['no-scopes']:
+ response_type = 'code'
+ error_url = url_for('invenio_oauth2server.errors',
+ _external=True)
+ # Missing scope
+ r = client.get(
+ url_for('invenio_oauth2server.authorize'),
+ data={
+ 'redirect_uri': redirect_uri,
+ 'response_type': response_type,
+ 'client_id': client_id,
+ })
+ next_url, data = parse_redirect(r.location)
+ assert r.status_code == 302
+ assert data['error'] == 'invalid_scope'
+ assert url_for('invenio_oauth2server.errors') in next_url
+
+ r = client.get(
+ url_for('invenio_oauth2server.errors'))
+ assert r.status_code == 400
+
def test_refresh_flow(provider_fixture):
app = provider_fixture
diff --git a/modules/weko-accounts/tests/test_views.py b/modules/weko-accounts/tests/test_views.py
index a91aa5ee1d..658ba64681 100644
--- a/modules/weko-accounts/tests/test_views.py
+++ b/modules/weko-accounts/tests/test_views.py
@@ -2,7 +2,7 @@
import pytest
import json
import redis
-from invenio_accounts.models import Role
+from invenio_accounts.models import Role, User
from flask import url_for,request,make_response,current_app,Flask
from flask_login.utils import login_user,logout_user
from flask_menu import current_menu
@@ -18,6 +18,7 @@
find_user_by_email,
shib_sp_login,
_adjust_shib_admin_DB,
+ generate_ams_login_url,
urlencode
)
from weko_admin.models import AdminSettings
@@ -26,6 +27,11 @@ def set_session(client,data):
with client.session_transaction() as session:
for k, v in data.items():
session[k] = v
+
+def del_session(client,key):
+ with client.session_transaction() as session:
+ del session[key]
+
#def _has_admin_access():
# .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_has_admin_access -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp
#def test_has_admin_access(request_context,users):
@@ -35,12 +41,12 @@ def set_session(client,data):
# logout_user()
# login_user(users[4]["obj"])
# result = _has_admin_access()
-# assert result == False
+# assert result is False
#def init_menu():
# .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_init_menu -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp
def test_init_menu(request_context):
init_menu()
- assert current_menu.submenu("setting.admin").active == True
+ assert current_menu.submenu("setting.admin").active is True
assert current_menu.submenu("settings.admin").url == "/admin/"
assert current_menu.submenu("settings.admin").text == '{{ content | escape_str }} {{ content | escape_str }} {{ content | escape_str }}
{%- endif -%}
{% endautoescape %}
diff --git a/modules/weko-search-ui/requirements2.txt b/modules/weko-search-ui/requirements2.txt
index c4702c5184..b01f66293a 100644
--- a/modules/weko-search-ui/requirements2.txt
+++ b/modules/weko-search-ui/requirements2.txt
@@ -288,3 +288,4 @@ xmlschema==0.9.30
xmltodict==0.12.0
zipp==3.6.0
zope.interface==5.5.2
+pypdfium2==4.30.0
diff --git a/modules/weko-search-ui/tests/conftest.py b/modules/weko-search-ui/tests/conftest.py
index f134eb98ca..a81cf2ee36 100644
--- a/modules/weko-search-ui/tests/conftest.py
+++ b/modules/weko-search-ui/tests/conftest.py
@@ -137,7 +137,13 @@
from weko_deposit.api import WekoDeposit
from weko_deposit.api import WekoDeposit as aWekoDeposit
from weko_deposit.api import WekoIndexer, WekoRecord
-from weko_deposit.config import WEKO_BUCKET_QUOTA_SIZE, WEKO_MAX_FILE_SIZE
+from weko_deposit.config import (
+ WEKO_BUCKET_QUOTA_SIZE,
+ WEKO_MAX_FILE_SIZE,
+ WEKO_DEPOSIT_FILESIZE_LIMIT,
+ WEKO_MIMETYPE_WHITELIST_FOR_ES,
+ WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES
+)
from weko_groups import WekoGroups
from weko_index_tree import WekoIndexTree, WekoIndexTreeREST
from weko_index_tree.api import Indexes
@@ -692,6 +698,9 @@ def base_app(instance_path, search_class, request):
WEKO_SEARCH_UI_BULK_EXPORT_RETRY = 5,
WEKO_SEARCH_UI_BULK_EXPORT_LIMIT = 100,
RECORDS_UI_ENDPOINTS = RECORDS_UI_ENDPOINTS,
+ WEKO_DEPOSIT_FILESIZE_LIMIT = WEKO_DEPOSIT_FILESIZE_LIMIT,
+ WEKO_MIMETYPE_WHITELIST_FOR_ES = WEKO_MIMETYPE_WHITELIST_FOR_ES,
+ WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES = WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES,
WEKO_SCHEMA_JPCOAR_V2_RESOURCE_TYPE_REPLACE={
"periodical": "journal",
"interview": "other",
diff --git a/modules/weko-search-ui/tests/data/ams/broken_word.docx b/modules/weko-search-ui/tests/data/ams/broken_word.docx
new file mode 100644
index 0000000000..3fa5f4e582
Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/broken_word.docx differ
diff --git a/modules/weko-search-ui/tests/data/ams/png_file.pdf b/modules/weko-search-ui/tests/data/ams/png_file.pdf
new file mode 100644
index 0000000000..cc8d7bda54
Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/png_file.pdf differ
diff --git a/modules/weko-search-ui/tests/data/ams/png_file.txt b/modules/weko-search-ui/tests/data/ams/png_file.txt
new file mode 100644
index 0000000000..cc8d7bda54
Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/png_file.txt differ
diff --git a/modules/weko-search-ui/tests/data/ams/sample.txt b/modules/weko-search-ui/tests/data/ams/sample.txt
new file mode 100644
index 0000000000..990383c64b
--- /dev/null
+++ b/modules/weko-search-ui/tests/data/ams/sample.txt
@@ -0,0 +1,2 @@
+This is a
+text file.
diff --git a/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json b/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json
new file mode 100644
index 0000000000..eb70def6c2
--- /dev/null
+++ b/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json
@@ -0,0 +1,99 @@
+{
+ "@id": "./",
+ "@type": "Dataset",
+ "datePublished": "2025-10-22",
+ "name": "extract",
+ "description": "Item metadata for Item ID: 2000036. Title: extract.",
+ "wk:index": [
+ "1623632832836"
+ ],
+ "wk:publishStatus": "public",
+ "wk:feedbackMail": [],
+ "wk:requestMail": [],
+ "wk:grant": [],
+ "wk:editMode": "Keep",
+ "dc:title": [
+ {
+ "@id": "#:title_0",
+ "@type": "PropertyValue",
+ "value": "extract",
+ "language": "ja"
+ }
+ ],
+ "dc:type": {
+ "@id": "#:type_1",
+ "@type": "PropertyValue",
+ "rdf:resource": "departmental bulletin paper",
+ "value": "http://purl.org/coar/resource_type/c_6501"
+ },
+ "hasPart": [
+ {
+ "@id": "data/guide.pdf",
+ "@type": "File",
+ "dcterms:accessRights": "open_access",
+ "datePublished": "2025-10-22",
+ "name": "guide.pdf",
+ "jpcoar:extent": [
+ {
+ "@id": "#:extent_3",
+ "@type": "File",
+ "value": "844 KB"
+ }
+ ],
+ "jpcoar:mimeType": "application/pdf",
+ "jpcoar:URI": {
+ "@id": "#:URI_4",
+ "@type": "URL",
+ "value": "https://192.168.56.102/record/2000036/files/guide.pdf"
+ },
+ "wk:textExtraction": true,
+ "wk:extendedMetadata": true
+ },
+ {
+ "@id": "data/sample.txt",
+ "@type": "File",
+ "dcterms:accessRights": "open_access",
+ "datePublished": "2025-10-22",
+ "name": "sample.txt",
+ "jpcoar:extent": [
+ {
+ "@id": "#:extent_6",
+ "@type": "File",
+ "value": "51 B"
+ }
+ ],
+ "jpcoar:mimeType": "text/plain",
+ "jpcoar:URI": {
+ "@id": "#:URI_7",
+ "@type": "URL",
+ "value": "https://192.168.56.102/record/2000036/files/sample.txt"
+ },
+ "wk:textExtraction": true,
+ "wk:extendedMetadata": true
+ },
+ {
+ "@id": "data/pp.pptx",
+ "@type": "File",
+ "dcterms:accessRights": "open_access",
+ "datePublished": "2025-10-22",
+ "name": "pp.pptx",
+ "jpcoar:extent": [
+ {
+ "@id": "#:extent_9",
+ "@type": "File",
+ "value": "432 KB"
+ }
+ ],
+ "jpcoar:mimeType": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "jpcoar:URI": {
+ "@id": "#:URI_10",
+ "@type": "URL",
+ "value": "https://192.168.56.102/record/2000036/files/pp.pptx"
+ },
+ "wk:textExtraction": true,
+ "wk:extendedMetadata": false
+ }
+ ],
+ "wk:itemLinks": [],
+ "wk:metadataAutoFill": false
+}
diff --git a/modules/weko-search-ui/tests/data/ams/without_hasPart.json b/modules/weko-search-ui/tests/data/ams/without_hasPart.json
new file mode 100644
index 0000000000..a4a18e1ba1
--- /dev/null
+++ b/modules/weko-search-ui/tests/data/ams/without_hasPart.json
@@ -0,0 +1,31 @@
+{
+ "@id": "./",
+ "@type": "Dataset",
+ "datePublished": "2025-10-22",
+ "name": "extract",
+ "description": "Item metadata for Item ID: 2000036. Title: extract.",
+ "wk:index": [
+ "1623632832836"
+ ],
+ "wk:publishStatus": "public",
+ "wk:feedbackMail": [],
+ "wk:requestMail": [],
+ "wk:grant": [],
+ "wk:editMode": "Keep",
+ "dc:title": [
+ {
+ "@id": "#:title_0",
+ "@type": "PropertyValue",
+ "value": "extract",
+ "language": "ja"
+ }
+ ],
+ "dc:type": {
+ "@id": "#:type_1",
+ "@type": "PropertyValue",
+ "rdf:resource": "departmental bulletin paper",
+ "value": "http://purl.org/coar/resource_type/c_6501"
+ },
+ "wk:itemLinks": [],
+ "wk:metadataAutoFill": false
+}
diff --git "a/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt" "b/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt"
new file mode 100644
index 0000000000..793629ceea
--- /dev/null
+++ "b/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt"
@@ -0,0 +1 @@
+上限:8バイト
diff --git a/modules/weko-search-ui/tests/test_mapper.py b/modules/weko-search-ui/tests/test_mapper.py
index c59f587991..c3fe1173d0 100644
--- a/modules/weko-search-ui/tests/test_mapper.py
+++ b/modules/weko-search-ui/tests/test_mapper.py
@@ -2,9 +2,11 @@
import pytest
import xmltodict
import uuid
+import json
from datetime import date
from unittest.mock import patch, MagicMock
from collections import OrderedDict
+from pypdfium2 import PdfiumError
from weko_records.api import Mapping
from weko_records.serializers.utils import get_full_mapping
@@ -4817,9 +4819,10 @@ def test_to_item_metadata(self, app, db, item_type2, item_type_mapping2):
# def deconstruct_json_ld(json_ld):
# .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test__deconstruct_json_ld -v -vv -s --cov-branch --cov-report=xml --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp
- def test__deconstruct_json_ld(self, app):
+ def test__deconstruct_json_ld(self, app, item_type2):
json_ld = json_data("data/jsonld/ro-crate-metadata.json")
- deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld(json_ld)
+ mapper = JsonLdMapper(item_type2.model.id, None)
+ deconstructed_metadata, format = mapper._deconstruct_json_ld(json_ld)
metadata, system_info = deconstructed_metadata[0]
assert format == "ro-crate"
@@ -4847,7 +4850,8 @@ def test__deconstruct_json_ld(self, app):
assert not any("@type" in key for key in metadata.keys())
json_ld = json_data("data/jsonld/ro-crate-metadata2.json")
- deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld(json_ld)
+ mapper = JsonLdMapper(item_type2.model.id, None)
+ deconstructed_metadata, format = mapper._deconstruct_json_ld(json_ld)
thesis, system_info = deconstructed_metadata[0]
assert format == "ro-crate"
@@ -4877,7 +4881,8 @@ def test__deconstruct_json_ld(self, app):
assert evidence["dc:type.@id"] == "http://purl.org/coar/resource_type/c_1843"
with pytest.raises(ValueError) as ex:
- deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld({})
+ mapper = JsonLdMapper(item_type2.model.id, None)
+ deconstructed_metadata, format = mapper._deconstruct_json_ld({})
ex.match('Invalid json-ld format: "@context" is invalid.')
# def to_rocrate_metadata(self, metadata):
@@ -5279,6 +5284,103 @@ def test_to_item_metadata_ams_dict(self, app, db, item_type2):
assert item_metadata["item_1749689698804"]["subitem_relation_type"] == "isVersionOf"
+ # def extract_extended_metadata(self, list_extracted):
+ # .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test_extract_extended_metadata -v -vv -s --cov-branch --cov-report=html --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp
+ def test_extract_extended_metadata(self, app, db, item_type2, mocker):
+ mapper = JsonLdMapper(item_type2.model.id, None)
+ values = ["first", "second"]
+ mocker.patch.object(mapper, "extract_text_from_files",
+ side_effect = values)
+
+ rocrate = json_data("data/ams/with_two_extended_metadata.json")
+ rocrate = mapper.extract_extended_metadata([rocrate])[0]
+
+ ids = [part["@id"]
+ for part in rocrate.get("hasPart", [])
+ if "@id" in part]
+ assert ids == ["data/pp.pptx"]
+
+ ext = rocrate["extended_metadata"]["value"]
+ ext = json.loads(ext)
+
+ assert len(ext) == 2
+ assert ext["data/sample.txt"] == "first"
+ assert ext["data/guide.pdf"] == "second"
+
+ # without hasPart
+ rocrate = json_data("data/ams/without_hasPart.json")
+ rocrate = mapper.extract_extended_metadata([rocrate])[0]
+ assert "extended_metadata" not in rocrate
+
+ # def extract_text_from_files(self, filename):
+ # .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test_extract_text_from_files -v -vv -s --cov-branch --cov-report=html --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp
+ def test_extract_text_from_files(self, app, db, item_type2, mocker, tmp_path):
+ mapper = JsonLdMapper(item_type2.model.id, None)
+
+ mapper.data_path = str(tmp_path)
+ file_content = "これは\r\nテキストファイルです\r\n"
+
+ file_name = "サンプル.txt"
+ tmpfile = tmp_path / file_name
+ tmpfile.write_text(file_content, encoding="shift_jis")
+ extract_text = mapper.extract_text_from_files(file_name)
+ assert extract_text == file_content
+
+ file_name = "サンプル.TXT"
+ tmpfile = tmp_path / file_name
+ tmpfile.write_text(file_content, encoding="utf-8")
+ extract_text = mapper.extract_text_from_files(file_name)
+ assert extract_text == file_content
+
+ file_name = "サンプル.ｔｘｔ"
+ tmpfile = tmp_path / file_name
+ tmpfile.write_text(file_content, encoding="utf-8")
+ extract_text = mapper.extract_text_from_files(file_name)
+ assert extract_text == ""
+
+ mapper.data_path = "tests/data/ams"
+
+ app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 8})
+ extract_text = mapper.extract_text_from_files("sample.txt")
+ assert extract_text == "This is "
+
+ app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 8})
+ extract_text = mapper.extract_text_from_files("サンプル2.txt")
+ assert extract_text == "上限:8"
+
+ app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 2 * 1024 * 1024})
+ extract_text = mapper.extract_text_from_files("sample.txt")
+ assert extract_text == "This is a\ntext file.\n"
+
+ with pytest.raises(ValueError) as e:
+ extract_text = mapper.extract_text_from_files("png_file.txt")
+ assert str(e.value) == "Failed to load text file: png_file.txt"
+
+ with pytest.raises(PdfiumError) as e:
+ extract_text = mapper.extract_text_from_files("png_file.pdf")
+ assert str(e.value) == "Failed to load PDF file: png_file.pdf"
+
+ with pytest.raises(ValueError) as e:
+ extract_text = mapper.extract_text_from_files("broken_word.docx")
+ assert str(e.value) == "Failed to load document: broken_word.docx"
+
+ with pytest.raises(FileNotFoundError) as e:
+ extract_text = mapper.extract_text_from_files("not_exist.txt")
+ assert str(e.value) == "File Not Found: not_exist.txt"
+
+ mocker.patch("weko_search_ui.mapper.extract_text_from_pdf",
+ return_value="This is a pdf file.")
+ mocker.patch("os.path.isfile", return_value=True)
+ extract_text = mapper.extract_text_from_files("pdffile.pdf")
+ assert extract_text == "This is a pdf file."
+
+ mocker.patch("weko_search_ui.mapper.extract_text_with_tika",
+ return_value="This is a pptx file.")
+ extract_text = mapper.extract_text_from_files("powerpoint.pptx")
+ assert extract_text == "This is a pptx file."
+
+ extract_text = mapper.extract_text_from_files("sample.other")
+ assert extract_text == ""
def test_set_by_jsonpath():
data = {}
diff --git a/modules/weko-search-ui/tests/test_rest.py b/modules/weko-search-ui/tests/test_rest.py
index d7255a5356..60d366e3e2 100644
--- a/modules/weko-search-ui/tests/test_rest.py
+++ b/modules/weko-search-ui/tests/test_rest.py
@@ -398,6 +398,10 @@ def test_IndexSearchResourceAPI(client_rest, db_register2, db_rocrate_mapping):
res = client_rest.get('/v1/records', headers=headers)
assert res.status_code == 200
+ headers = {'Accept-Language': 'ja,en-US;q=0.9,en;q=0.8'}
+ res = client_rest.get('/v1/records', headers=headers)
+ assert res.status_code == 200
+
with patch('weko_search_ui.rest.SearchSetting.get_sort_key', return_value=False):
res = client_rest.get('/v1/records')
assert res.status_code == 200
diff --git a/modules/weko-search-ui/tests/test_utils.py b/modules/weko-search-ui/tests/test_utils.py
index 850ebb8521..d8209889c5 100644
--- a/modules/weko-search-ui/tests/test_utils.py
+++ b/modules/weko-search-ui/tests/test_utils.py
@@ -1006,7 +1006,8 @@ def test_handle_convert_validate_msg_to_jp(i18n_app):
# def handle_validate_item_import(list_record, schema) -> list:
-def test_handle_validate_item_import(app, mocker_itemtype):
+# .tox/c1/bin/pytest --cov=weko_search_ui tests/test_utils.py::test_handle_validate_item_import -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp
+def test_handle_validate_item_import(app, mocker_itemtype, mocker):
filepath = os.path.join(
os.path.dirname(os.path.realpath(__file__)), "data", "csv", "data.json"
)
@@ -1040,6 +1041,96 @@ def test_handle_validate_item_import(app, mocker_itemtype):
== result
)
+ schema = {
+ "type": "object",
+ "properties": {
+ "item_xxx": {
+ "type": "object",
+ "properties": {
+ "subitem_yyy": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "subitem_zzz": {
+ "type": "string",
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ list_record = [
+ {
+ "metadata": {
+ 'item_xxx': {
+ 'subitem_yyy':[
+ {"subitem_zzz": 123}
+ ]
+ }
+ }
+ }
+ ]
+ with app.test_request_context():
+ with set_locale("en"):
+ result = handle_validate_item_import(list_record, schema)
+ warnings = result[0].get("warnings", [])
+ target = list_record[0]["metadata"]['item_xxx']['subitem_yyy'][0]["subitem_zzz"]
+ assert any("Replace value of" in w for w in warnings)
+ assert any("is different from existing" in w for w in warnings)
+ assert type(target) == str
+
+ list_record[0]["metadata"]['item_xxx']['subitem_yyy'][0]["subitem_zzz"] = 456
+
+ with app.test_request_context():
+ with set_locale("ja"):
+ result = handle_validate_item_import(list_record, schema)
+ warnings = result[0].get("warnings", [])
+ assert any("へ置き換えました。" in w for w in warnings)
+ assert any("と異なっています。" in w for w in warnings)
+
+ schema = {
+ "type": "object",
+ "properties": {
+ "item_aaa": {
+ "type": "object",
+ "properties": {
+ "subitem_bbb": {
+ "type": "object",
+ "properties": {
+ "subitem_ccc": {
+ "enum": [None, "Yes|Yes", "No|No"],
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ list_record = [
+ {
+ "metadata": {
+ 'item_aaa': {
+ 'subitem_bbb': {
+ "subitem_ccc": "Yes"
+ }
+ }
+ }
+ }
+ ]
+ with app.test_request_context():
+ with set_locale("en"):
+ result = handle_validate_item_import(list_record, schema)
+ assert "errors" in result[0]
+
+ with app.test_request_context():
+ with set_locale("ja"):
+ result = handle_validate_item_import(list_record, schema)
+ assert "errors" in result[0]
# def represents_int(s):
def test_represents_int():
diff --git a/modules/weko-search-ui/weko_search_ui/mapper.py b/modules/weko-search-ui/weko_search_ui/mapper.py
index aaa343878d..bfa57ac489 100644
--- a/modules/weko-search-ui/weko_search_ui/mapper.py
+++ b/modules/weko-search-ui/weko_search_ui/mapper.py
@@ -11,6 +11,9 @@
import os
import re
import json
+import chardet
+import mimetypes
+from pypdfium2 import PdfiumError
import itertools
import xmltodict
import traceback
@@ -28,6 +31,7 @@
Mapping, ItemTypes, FeedbackMailList, RequestMailList, ItemLink
)
from weko_records.serializers.utils import get_full_mapping
+from weko_deposit.utils import extract_text_from_pdf, extract_text_with_tika
from .config import ROCRATE_METADATA_FILE, ROCRATE_METADATA_WK_CONTEXT_V1
@@ -1571,8 +1575,7 @@ def is_url(s: str) -> bool:
# }
return mapped_metadata, system_info
- @classmethod
- def _deconstruct_json_ld(cls, json_ld):
+ def _deconstruct_json_ld(self, json_ld):
"""Deconstruct json-ld.
Deconstructing json-ld metadata values one by one
@@ -1682,10 +1685,11 @@ def _resolve_link(value):
list_extracted = [ extracted ]
else:
list_extracted = [ extracted ]
+ self.extract_extended_metadata(list_extracted)
list_deconstructed = []
for extracted in list_extracted:
- metadata = cls._deconstruct_dict(extracted)
+ metadata = self._deconstruct_dict(extracted)
system_info = {}
system_info.update(
{"id": metadata.pop("identifier")}
@@ -1863,6 +1867,91 @@ def _check_settable_path(self, json_path):
return settable_path
+ def extract_extended_metadata(self, list_extracted):
+ """
+ Store the content of files with wk:extendedMetadata set to True in extended_metadata,
+ and remove files with wk:extendedMetadata set to True from hasPart.
+
+ Args:
+ list_extracted (list): List of extracted metadata dictionaries.
+ Returns:
+ list: The updated list of extracted metadata with extended metadata merged.
+ """
+ for extracted in list_extracted:
+ extracted.pop('extended_metadata', None)
+ if 'hasPart' not in extracted:
+ continue
+ file_indices = [
+ idx for idx, item in enumerate(extracted['hasPart'])
+ if item.get('wk:extendedMetadata') is True
+ ]
+ if not file_indices:
+ continue
+ extended_metadatas = {}
+ extracted['extended_metadata'] = {}
+ for idx in reversed(file_indices):
+ filename = extracted['hasPart'].pop(idx).get('@id')
+ content = self.extract_text_from_files(filename)
+ extended_metadatas[filename] = content
+ extracted['extended_metadata']['value'] = json.dumps(
+ extended_metadatas, ensure_ascii=False)
+ return list_extracted
+
+ def extract_text_from_files(self, filename):
+ """
+ Extract text content from the specified file,
+ only if the file is of a specific MIME type.
+ Args:
+ filename (str): The name of the file to extract text from.
+
+ Returns:
+ str: The extracted text content from the file.
+ """
+ data_path = self.data_path
+ try:
+ file_path = os.path.join(data_path, filename)
+ if not os.path.isfile(file_path):
+ raise FileNotFoundError
+ data = ""
+ mimetype = mimetypes.guess_type(filename)[0]
+ file_size_limit = current_app.config['WEKO_DEPOSIT_FILESIZE_LIMIT']
+ # List of text-based MIME types allowed for text extraction and processing.
+ text_mimetypes = current_app.config["WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES"]
+ # All mimetypes subject to text extraction (including text_mimetypes)
+ extract_mimetypes = current_app.config["WEKO_MIMETYPE_WHITELIST_FOR_ES"]
+ if mimetype not in extract_mimetypes:
+ return data
+
+ # Extract content from file
+ current_app.logger.debug(f"extracting content from {filename}")
+ if mimetype in text_mimetypes:
+ with open(file_path, "rb") as fp:
+ data = fp.read(file_size_limit)
+ inf = chardet.detect(data)
+ if inf["encoding"] is None:
+ raise ValueError(
+ f"Failed to load text file: {filename}")
+ data = data.decode(inf["encoding"], errors="replace")
+ elif mimetype == 'application/pdf':
+ data = extract_text_from_pdf(file_path, file_size_limit)
+ else:
+ try:
+ data = extract_text_with_tika(file_path, file_size_limit)
+ except Exception as e:
+ current_app.logger.error(e)
+ traceback.print_exc()
+ raise ValueError(
+ f"Failed to load document: {filename}") from e
+ except FileNotFoundError as e:
+ current_app.logger.error(e)
+ traceback.print_exc()
+ raise FileNotFoundError(f"File Not Found: {filename}") from e
+ except PdfiumError as e:
+ current_app.logger.error(e)
+ traceback.print_exc()
+ raise PdfiumError(f"Failed to load PDF file: {filename}") from e
+ return data
+
def to_rocrate_metadata(
self, record_metadata=None, tsv_row_metadata=None, **kwargs
):
@@ -2461,4 +2550,3 @@ def tokenize_jsonpath(json_path):
index = None
tokens.append((element, index, current_path))
return tokens
-
diff --git a/modules/weko-search-ui/weko_search_ui/rest.py b/modules/weko-search-ui/weko_search_ui/rest.py
index ee0095b6c8..2e797275cc 100644
--- a/modules/weko-search-ui/weko_search_ui/rest.py
+++ b/modules/weko-search-ui/weko_search_ui/rest.py
@@ -600,6 +600,8 @@ def get_v1(self, **kwargs):
try:
# Language setting
language = request.headers.get('Accept-Language')
+ if isinstance(language, str):
+ language = language.split(',')[0].split(';')[0].strip()
if language:
get_locale().language = language
diff --git a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo
index 084df4f48b..cb7fc7ab93 100644
Binary files a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo and b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po
index d4ba275c83..5a50d17255 100644
--- a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po
+++ b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: weko-search-ui 0.1.0.dev20170000\n"
"Report-Msgid-Bugs-To: wekosoftware@nii.ac.jp\n"
-"POT-Creation-Date: 2025-11-11 20:49+0900\n"
+"POT-Creation-Date: 2025-12-17 13:33+0900\n"
"PO-Revision-Date: 2025-04-09 23:22+0900\n"
"Last-Translator: FULL NAME \n"
"Language: en\n"
@@ -19,69 +19,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: tests/conftest.py:400
+#: tests/conftest.py:406
msgid "write your own license"
msgstr ""
-#: tests/conftest.py:405
+#: tests/conftest.py:411
msgid "Creative Commons CC0 1.0 Universal Public Domain Designation"
msgstr ""
-#: tests/conftest.py:421
+#: tests/conftest.py:427
msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)"
msgstr ""
-#: tests/conftest.py:433
+#: tests/conftest.py:439
msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)"
msgstr ""
-#: tests/conftest.py:448
+#: tests/conftest.py:454
msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)"
msgstr ""
-#: tests/conftest.py:462
+#: tests/conftest.py:468
msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)"
msgstr ""
-#: tests/conftest.py:477
+#: tests/conftest.py:483
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC "
"BY-NC-SA 3.0)"
msgstr ""
-#: tests/conftest.py:492
+#: tests/conftest.py:498
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-"
"NC-ND 3.0)"
msgstr ""
-#: tests/conftest.py:508
+#: tests/conftest.py:514
msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)"
msgstr ""
-#: tests/conftest.py:520
+#: tests/conftest.py:526
msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)"
msgstr ""
-#: tests/conftest.py:535
+#: tests/conftest.py:541
msgid ""
"Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND "
"4.0)"
msgstr ""
-#: tests/conftest.py:550
+#: tests/conftest.py:556
msgid ""
"Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC "
"4.0)"
msgstr ""
-#: tests/conftest.py:565
+#: tests/conftest.py:571
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International "
"(CC BY-NC-SA 4.0)"
msgstr ""
-#: tests/conftest.py:580
+#: tests/conftest.py:586
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 "
"International (CC BY-NC-ND 4.0)"
@@ -215,42 +215,44 @@ msgstr ""
msgid "Import Result"
msgstr ""
-#: weko_search_ui/mapper.py:1347
+#: weko_search_ui/mapper.py:1351
msgid "\"{key}\" is required."
msgstr ""
-#: weko_search_ui/mapper.py:1368
+#: weko_search_ui/mapper.py:1372
+#, python-brace-format
msgid "\"{key}\" is not in itemtype."
msgstr ""
-#: weko_search_ui/mapper.py:1370
+#: weko_search_ui/mapper.py:1374
+#, python-brace-format
msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?"
msgstr ""
-#: weko_search_ui/mapper.py:1491
+#: weko_search_ui/mapper.py:1495
#, python-format
msgid ""
"Cannot map to item type from json-ld; Mapping is not defined for the "
"metadata, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1517
+#: weko_search_ui/mapper.py:1521
#, python-format
msgid ""
"Cannot map to item type from json-ld; Not found mapping destination for "
"the metadata, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1527
+#: weko_search_ui/mapper.py:1531
#, python-format
msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1547
+#: weko_search_ui/mapper.py:1553
msgid "Metadata which could not be mapped to item type will be set in 'Extra'."
msgstr ""
-#: weko_search_ui/mapper.py:1551
+#: weko_search_ui/mapper.py:1557
msgid "Metadata which could not be mapped to item type will be discarded."
msgstr ""
@@ -269,6 +271,7 @@ msgid ""
msgstr ""
#: weko_search_ui/utils.py:615
+#, python-brace-format
msgid ""
"The csv/tsv file was not found in the specified file {}. Check if the "
"directory structure is correct."
@@ -281,6 +284,7 @@ msgid ""
msgstr ""
#: weko_search_ui/utils.py:731
+#, python-brace-format
msgid ""
"The xml file was not found in the specified file {}. Check if the "
"directory structure is correct."
@@ -311,6 +315,7 @@ msgid ""
msgstr ""
#: weko_search_ui/utils.py:1244
+#, python-brace-format
msgid "The item type ID specified in the {} file does not exist."
msgstr ""
@@ -319,24 +324,29 @@ msgid "Cannot register because the specified item type is not the latest version
msgstr ""
#: weko_search_ui/utils.py:1268
+#, python-brace-format
msgid "The following metadata keys are duplicated.\n"
"Language: ja\n"
@@ -19,69 +19,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: tests/conftest.py:400
+#: tests/conftest.py:406
msgid "write your own license"
msgstr ""
-#: tests/conftest.py:405
+#: tests/conftest.py:411
msgid "Creative Commons CC0 1.0 Universal Public Domain Designation"
msgstr ""
-#: tests/conftest.py:421
+#: tests/conftest.py:427
msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)"
msgstr ""
-#: tests/conftest.py:433
+#: tests/conftest.py:439
msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)"
msgstr ""
-#: tests/conftest.py:448
+#: tests/conftest.py:454
msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)"
msgstr ""
-#: tests/conftest.py:462
+#: tests/conftest.py:468
msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)"
msgstr ""
-#: tests/conftest.py:477
+#: tests/conftest.py:483
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC "
"BY-NC-SA 3.0)"
msgstr ""
-#: tests/conftest.py:492
+#: tests/conftest.py:498
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-"
"NC-ND 3.0)"
msgstr ""
-#: tests/conftest.py:508
+#: tests/conftest.py:514
msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)"
msgstr ""
-#: tests/conftest.py:520
+#: tests/conftest.py:526
msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)"
msgstr ""
-#: tests/conftest.py:535
+#: tests/conftest.py:541
msgid ""
"Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND "
"4.0)"
msgstr ""
-#: tests/conftest.py:550
+#: tests/conftest.py:556
msgid ""
"Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC "
"4.0)"
msgstr ""
-#: tests/conftest.py:565
+#: tests/conftest.py:571
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International "
"(CC BY-NC-SA 4.0)"
msgstr ""
-#: tests/conftest.py:580
+#: tests/conftest.py:586
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 "
"International (CC BY-NC-ND 4.0)"
@@ -215,42 +215,42 @@ msgstr "ステータス"
msgid "Import Result"
msgstr "インポート結果"
-#: weko_search_ui/mapper.py:1347
+#: weko_search_ui/mapper.py:1351
msgid "\"{key}\" is required."
msgstr "「{key}」 に対応するマッピングが必要です。"
-#: weko_search_ui/mapper.py:1368
+#: weko_search_ui/mapper.py:1372
msgid "\"{key}\" is not in itemtype."
msgstr "「{key}」 はアイテムタイプに存在しません。"
-#: weko_search_ui/mapper.py:1370
+#: weko_search_ui/mapper.py:1374
msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?"
msgstr "「{key}」 はアイテムタイプに存在しません。「{similar_key}」であれば存在します。"
-#: weko_search_ui/mapper.py:1491
+#: weko_search_ui/mapper.py:1495
#, python-format
msgid ""
"Cannot map to item type from json-ld; Mapping is not defined for the "
"metadata, \"%(key)s\": \"%(value)s\""
msgstr "対応するマッピングが定義されてないため、このメタデータはアイテムタイプに変換できません。\"%(key)s\": \"%(value)s\""
-#: weko_search_ui/mapper.py:1517
+#: weko_search_ui/mapper.py:1521
#, python-format
msgid ""
"Cannot map to item type from json-ld; Not found mapping destination for "
"the metadata, \"%(key)s\": \"%(value)s\""
msgstr "マッピング先が見つからないため、このメタデータはアイテムタイプに変換できません。\"%(key)s\": \"%(value)s\""
-#: weko_search_ui/mapper.py:1527
+#: weko_search_ui/mapper.py:1531
#, python-format
msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\""
msgstr "アイテムタイプへのマッピングに失敗しました。\"%(key)s\": \"%(value)s\""
-#: weko_search_ui/mapper.py:1547
+#: weko_search_ui/mapper.py:1553
msgid "Metadata which could not be mapped to item type will be set in 'Extra'."
msgstr "アイテムタイプにマッピングできなかったメタデータは、「Extra」プロパティに登録されます。"
-#: weko_search_ui/mapper.py:1551
+#: weko_search_ui/mapper.py:1557
msgid "Metadata which could not be mapped to item type will be discarded."
msgstr "アイテムタイプにマッピングできなかったメタデータは破棄されます。"
@@ -348,259 +348,269 @@ msgid ""
" the file is UTF-8 encoded."
msgstr ""
-#: weko_search_ui/utils.py:1454
+#: weko_search_ui/utils.py:1455
msgid "Please specify item ID by half-width number."
msgstr "アイテムIDは半角数字で指定してください。"
-#: weko_search_ui/utils.py:1469
+#: weko_search_ui/utils.py:1477
+#, python-format
+msgid "Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'."
+msgstr "%(target_path)sの値を%(old_value)sから'%(new_value)s'へ置き換えました。"
+
+#: weko_search_ui/utils.py:1489
msgid "Specified item type does not exist."
msgstr "指定されたアイテムタイプが存在していません。"
-#: weko_search_ui/utils.py:1540
+#: weko_search_ui/utils.py:1495
+#, python-brace-format, python-format
+msgid "Specified %(type)s is different from existing %(existing_type)s."
+msgstr "指定された%(type)sは登録している%(existing_type)sと異なっています。"
+
+#: weko_search_ui/utils.py:1567
msgid "The same item may have been registered."
msgstr "同じアイテムが登録されている可能性があります。"
-#: weko_search_ui/utils.py:1570
+#: weko_search_ui/utils.py:1597
msgid "Specified URI and system URI do not match."
msgstr "指定されたURIとシステムURIが一致しません。"
-#: weko_search_ui/utils.py:1582
+#: weko_search_ui/utils.py:1609
msgid "Item does not exist in the system."
msgstr "アイテムがシステムに存在しません。"
-#: weko_search_ui/utils.py:1589
+#: weko_search_ui/utils.py:1616
msgid "Item already DELETED in the system."
msgstr "アイテムは削除済です。"
-#: weko_search_ui/utils.py:1606
+#: weko_search_ui/utils.py:1633
msgid "Please specify either \"Keep\" or \"Upgrade\"."
msgstr "Keep、Upgradeのいずれかを指定してください。"
-#: weko_search_ui/utils.py:2565
+#: weko_search_ui/utils.py:2592
msgid "Title is required item."
msgstr "タイトルは必須項目です。"
-#: weko_search_ui/utils.py:2582
+#: weko_search_ui/utils.py:2609
msgid "{} is required item."
msgstr "{}は必須項目です。"
-#: weko_search_ui/utils.py:2585
+#: weko_search_ui/utils.py:2612
msgid "Please set \"public\" or \"private\" for {}."
msgstr "{}はpublic、privateのいずれかを設定してください。"
-#: weko_search_ui/utils.py:2626
+#: weko_search_ui/utils.py:2653
msgid "The specified {} does not exist in system."
msgstr "指定された{}はシステムに存在しません。"
-#: weko_search_ui/utils.py:2636
+#: weko_search_ui/utils.py:2663
msgid "Specified {} does not match with existing index."
msgstr "指定された{}はシステムのものと一致していません。"
-#: weko_search_ui/utils.py:2680
+#: weko_search_ui/utils.py:2707
msgid "Your role cannot register items in this index."
msgstr "ロールの権限が足りずこのインデックスにアイテム登録ができません。"
-#: weko_search_ui/utils.py:2701
+#: weko_search_ui/utils.py:2728
msgid "Both of IndexID and POS_INDEX are not being set."
msgstr "IndexID, POS_INDEXがどちらも設定されていません。"
-#: weko_search_ui/utils.py:2747 weko_search_ui/utils.py:2772
+#: weko_search_ui/utils.py:2774 weko_search_ui/utils.py:2799
msgid "Specified {} is invalid."
msgstr "指定された{}は不正です。"
-#: weko_search_ui/utils.py:2806
+#: weko_search_ui/utils.py:2833
msgid "If there is a info of content file, terms of use cannot be set."
msgstr "コンテンツファイル情報がある場合、利用規約は設定できません。"
-#: weko_search_ui/utils.py:2813 weko_search_ui/utils.py:6063
+#: weko_search_ui/utils.py:2840 weko_search_ui/utils.py:6090
msgid "The specified provinding method does not exist in the system"
msgstr "指定する提供方法はシステムに存在しません。"
-#: weko_search_ui/utils.py:2818 weko_search_ui/utils.py:6058
+#: weko_search_ui/utils.py:2845 weko_search_ui/utils.py:6085
msgid "The specified terms does not exist in the system"
msgstr "指定する利用規約はシステムに存在しません。"
-#: weko_search_ui/utils.py:2910 weko_search_ui/utils.py:2943
-#: weko_search_ui/utils.py:3035 weko_search_ui/utils.py:3147
-#: weko_search_ui/utils.py:3169 weko_search_ui/utils.py:3204
+#: weko_search_ui/utils.py:2937 weko_search_ui/utils.py:2970
+#: weko_search_ui/utils.py:3062 weko_search_ui/utils.py:3174
+#: weko_search_ui/utils.py:3196 weko_search_ui/utils.py:3231
msgid "Please specify {}."
msgstr "{}を設定してください。"
-#: weko_search_ui/utils.py:2913 weko_search_ui/utils.py:3150
+#: weko_search_ui/utils.py:2940 weko_search_ui/utils.py:3177
msgid "The specified {} exceeds the maximum length."
msgstr "指定された{}が最大長を超えています。"
-#: weko_search_ui/utils.py:2928 weko_search_ui/utils.py:3085
-#: weko_search_ui/utils.py:3096 weko_search_ui/utils.py:3165
+#: weko_search_ui/utils.py:2955 weko_search_ui/utils.py:3112
+#: weko_search_ui/utils.py:3123 weko_search_ui/utils.py:3192
msgid "Specified Prefix of {} is incorrect."
msgstr "指定された{}のPrefixが誤っています。"
-#: weko_search_ui/utils.py:2936 weko_search_ui/utils.py:3079
-#: weko_search_ui/utils.py:3089
+#: weko_search_ui/utils.py:2963 weko_search_ui/utils.py:3106
+#: weko_search_ui/utils.py:3116
msgid "{} cannot be set."
msgstr "{}は設定できません。"
-#: weko_search_ui/utils.py:2945 weko_search_ui/utils.py:2949
-#: weko_search_ui/utils.py:3018 weko_search_ui/utils.py:3206
+#: weko_search_ui/utils.py:2972 weko_search_ui/utils.py:2976
+#: weko_search_ui/utils.py:3045 weko_search_ui/utils.py:3233
msgid "Specified {} is different from existing {}."
msgstr "指定された{}は登録している{}と異なっています。"
-#: weko_search_ui/utils.py:2969
+#: weko_search_ui/utils.py:2996
msgid ""
"When assigning a DOI to an item, it must be associated with an index "
"whose index status is \"Public\" and Harvest Publishing is \"Public\"."
msgstr ""
-#: weko_search_ui/utils.py:2974
+#: weko_search_ui/utils.py:3001
msgid ""
"Since the item has a DOI, it must be associated with an index whose index"
" status is \"Public\" and whose Harvest Publishing is \"Public\"."
msgstr "アイテムにDOIが付与されているため、インデックス状態が「公開」かつハーベスト公開が「公開」のインデックスに関連付けが必要です。"
-#: weko_search_ui/utils.py:2985
+#: weko_search_ui/utils.py:3012
msgid "You cannot keep an item private because it has a DOI."
msgstr "アイテムにDOIが付与されているため、アイテムを非公開にすることはできません。"
-#: weko_search_ui/utils.py:3039 weko_search_ui/utils.py:4335
+#: weko_search_ui/utils.py:3066 weko_search_ui/utils.py:4362
msgid "DOI_RA should be set by one of JaLC, Crossref, DataCite, NDL JaLC."
msgstr "DOI_RAはJaLC,Crossref,DataCite,NDL JaLCのいずれかを設定してください。"
-#: weko_search_ui/utils.py:3122
+#: weko_search_ui/utils.py:3149
msgid "Specified DOI was withdrawn. Please specify another DOI."
msgstr "指定されたDOIは取り下げられました。別のDOIを指定してください。"
-#: weko_search_ui/utils.py:3130
+#: weko_search_ui/utils.py:3157
msgid ""
"Specified DOI has been used already for another item. Please specify "
"another DOI."
msgstr "指定されたDOIは既に別のアイテムに付与されています。別のDOIを指定してください。"
-#: weko_search_ui/utils.py:3226
+#: weko_search_ui/utils.py:3253
msgid ""
"Specified DOI is duplicated with another import item. Please specify "
"another DOI."
msgstr "指定されたDOIはインポートファイル内で重複しています。別のDOIを指定してください。"
-#: weko_search_ui/utils.py:3259
+#: weko_search_ui/utils.py:3286
msgid "Item Link type: '{}' is not one of {}."
msgstr "リンクタイプ'{}'は次の決められた選択肢に含まれていません。{}"
-#: weko_search_ui/utils.py:3263
+#: weko_search_ui/utils.py:3290
msgid "Please specify Item URL for item link."
msgstr "アイテムリンク先のURLを指定してください。"
-#: weko_search_ui/utils.py:3277
+#: weko_search_ui/utils.py:3304
msgid "Specified Item Link URI and system URI do not match."
msgstr "指定されたアイテムリンク先URIとシステムURIが一致しません。"
-#: weko_search_ui/utils.py:3283
+#: weko_search_ui/utils.py:3310
msgid "Linking item does not exist in the system."
msgstr "リンク先アイテムがシステムに存在しません。"
-#: weko_search_ui/utils.py:3286
+#: weko_search_ui/utils.py:3313
msgid "Linking item already deleted in the system."
msgstr "リンク先アイテムは削除済です。"
-#: weko_search_ui/utils.py:3325
+#: weko_search_ui/utils.py:3352
msgid "It is not allowed to create links to the item itself."
msgstr "自身へのアイテムリンクを作成することはできません。"
-#: weko_search_ui/utils.py:3330
+#: weko_search_ui/utils.py:3357
msgid "It is not allowed to create links other than {} between split items."
msgstr "分割したアイテム間で{}以外のリンクを作成することはできません。"
-#: weko_search_ui/utils.py:3366
+#: weko_search_ui/utils.py:3393
msgid "Duplicate Item Link."
msgstr "重複するアイテムリンクを作成することはできません。"
-#: weko_search_ui/utils.py:3403
+#: weko_search_ui/utils.py:3430
msgid "'wk:metadataReplace' flag cannot be used when registering an item."
msgstr "RO-Crate インポートでは、`wk:metadataReplace`フラグを有効にできません。"
-#: weko_search_ui/utils.py:3720
+#: weko_search_ui/utils.py:3747
msgid ""
"One of the following required values has not been "
"registered.\n"
"Language-Team: LANGUAGE \n"
@@ -18,69 +18,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: tests/conftest.py:400
+#: tests/conftest.py:406
msgid "write your own license"
msgstr ""
-#: tests/conftest.py:405
+#: tests/conftest.py:411
msgid "Creative Commons CC0 1.0 Universal Public Domain Designation"
msgstr ""
-#: tests/conftest.py:421
+#: tests/conftest.py:427
msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)"
msgstr ""
-#: tests/conftest.py:433
+#: tests/conftest.py:439
msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)"
msgstr ""
-#: tests/conftest.py:448
+#: tests/conftest.py:454
msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)"
msgstr ""
-#: tests/conftest.py:462
+#: tests/conftest.py:468
msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)"
msgstr ""
-#: tests/conftest.py:477
+#: tests/conftest.py:483
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC "
"BY-NC-SA 3.0)"
msgstr ""
-#: tests/conftest.py:492
+#: tests/conftest.py:498
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-"
"NC-ND 3.0)"
msgstr ""
-#: tests/conftest.py:508
+#: tests/conftest.py:514
msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)"
msgstr ""
-#: tests/conftest.py:520
+#: tests/conftest.py:526
msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)"
msgstr ""
-#: tests/conftest.py:535
+#: tests/conftest.py:541
msgid ""
"Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND "
"4.0)"
msgstr ""
-#: tests/conftest.py:550
+#: tests/conftest.py:556
msgid ""
"Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC "
"4.0)"
msgstr ""
-#: tests/conftest.py:565
+#: tests/conftest.py:571
msgid ""
"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International "
"(CC BY-NC-SA 4.0)"
msgstr ""
-#: tests/conftest.py:580
+#: tests/conftest.py:586
msgid ""
"Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 "
"International (CC BY-NC-ND 4.0)"
@@ -214,42 +214,42 @@ msgstr ""
msgid "Import Result"
msgstr ""
-#: weko_search_ui/mapper.py:1347
+#: weko_search_ui/mapper.py:1351
msgid "\"{key}\" is required."
msgstr ""
-#: weko_search_ui/mapper.py:1368
+#: weko_search_ui/mapper.py:1372
msgid "\"{key}\" is not in itemtype."
msgstr ""
-#: weko_search_ui/mapper.py:1370
+#: weko_search_ui/mapper.py:1374
msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?"
msgstr ""
-#: weko_search_ui/mapper.py:1491
+#: weko_search_ui/mapper.py:1495
#, python-format
msgid ""
"Cannot map to item type from json-ld; Mapping is not defined for the "
"metadata, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1517
+#: weko_search_ui/mapper.py:1521
#, python-format
msgid ""
"Cannot map to item type from json-ld; Not found mapping destination for "
"the metadata, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1527
+#: weko_search_ui/mapper.py:1531
#, python-format
msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\""
msgstr ""
-#: weko_search_ui/mapper.py:1547
+#: weko_search_ui/mapper.py:1553
msgid "Metadata which could not be mapped to item type will be set in 'Extra'."
msgstr ""
-#: weko_search_ui/mapper.py:1551
+#: weko_search_ui/mapper.py:1557
msgid "Metadata which could not be mapped to item type will be discarded."
msgstr ""
@@ -347,259 +347,269 @@ msgid ""
" the file is UTF-8 encoded."
msgstr ""
-#: weko_search_ui/utils.py:1454
+#: weko_search_ui/utils.py:1455
msgid "Please specify item ID by half-width number."
msgstr ""
-#: weko_search_ui/utils.py:1469
+#: weko_search_ui/utils.py:1477
+#, python-format
+msgid "Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'."
+msgstr ""
+
+#: weko_search_ui/utils.py:1489
msgid "Specified item type does not exist."
msgstr ""
-#: weko_search_ui/utils.py:1540
+#: weko_search_ui/utils.py:1495
+#, python-format
+msgid "Specified %(type)s is different from existing %(existing_type)s."
+msgstr ""
+
+#: weko_search_ui/utils.py:1567
msgid "The same item may have been registered."
msgstr ""
-#: weko_search_ui/utils.py:1570
+#: weko_search_ui/utils.py:1597
msgid "Specified URI and system URI do not match."
msgstr ""
-#: weko_search_ui/utils.py:1582
+#: weko_search_ui/utils.py:1609
msgid "Item does not exist in the system."
msgstr ""
-#: weko_search_ui/utils.py:1589
+#: weko_search_ui/utils.py:1616
msgid "Item already DELETED in the system."
msgstr ""
-#: weko_search_ui/utils.py:1606
+#: weko_search_ui/utils.py:1633
msgid "Please specify either \"Keep\" or \"Upgrade\"."
msgstr ""
-#: weko_search_ui/utils.py:2565
+#: weko_search_ui/utils.py:2592
msgid "Title is required item."
msgstr ""
-#: weko_search_ui/utils.py:2582
+#: weko_search_ui/utils.py:2609
msgid "{} is required item."
msgstr ""
-#: weko_search_ui/utils.py:2585
+#: weko_search_ui/utils.py:2612
msgid "Please set \"public\" or \"private\" for {}."
msgstr ""
-#: weko_search_ui/utils.py:2626
+#: weko_search_ui/utils.py:2653
msgid "The specified {} does not exist in system."
msgstr ""
-#: weko_search_ui/utils.py:2636
+#: weko_search_ui/utils.py:2663
msgid "Specified {} does not match with existing index."
msgstr ""
-#: weko_search_ui/utils.py:2680
+#: weko_search_ui/utils.py:2707
msgid "Your role cannot register items in this index."
msgstr ""
-#: weko_search_ui/utils.py:2701
+#: weko_search_ui/utils.py:2728
msgid "Both of IndexID and POS_INDEX are not being set."
msgstr ""
-#: weko_search_ui/utils.py:2747 weko_search_ui/utils.py:2772
+#: weko_search_ui/utils.py:2774 weko_search_ui/utils.py:2799
msgid "Specified {} is invalid."
msgstr ""
-#: weko_search_ui/utils.py:2806
+#: weko_search_ui/utils.py:2833
msgid "If there is a info of content file, terms of use cannot be set."
msgstr ""
-#: weko_search_ui/utils.py:2813 weko_search_ui/utils.py:6063
+#: weko_search_ui/utils.py:2840 weko_search_ui/utils.py:6090
msgid "The specified provinding method does not exist in the system"
msgstr ""
-#: weko_search_ui/utils.py:2818 weko_search_ui/utils.py:6058
+#: weko_search_ui/utils.py:2845 weko_search_ui/utils.py:6085
msgid "The specified terms does not exist in the system"
msgstr ""
-#: weko_search_ui/utils.py:2910 weko_search_ui/utils.py:2943
-#: weko_search_ui/utils.py:3035 weko_search_ui/utils.py:3147
-#: weko_search_ui/utils.py:3169 weko_search_ui/utils.py:3204
+#: weko_search_ui/utils.py:2937 weko_search_ui/utils.py:2970
+#: weko_search_ui/utils.py:3062 weko_search_ui/utils.py:3174
+#: weko_search_ui/utils.py:3196 weko_search_ui/utils.py:3231
msgid "Please specify {}."
msgstr ""
-#: weko_search_ui/utils.py:2913 weko_search_ui/utils.py:3150
+#: weko_search_ui/utils.py:2940 weko_search_ui/utils.py:3177
msgid "The specified {} exceeds the maximum length."
msgstr ""
-#: weko_search_ui/utils.py:2928 weko_search_ui/utils.py:3085
-#: weko_search_ui/utils.py:3096 weko_search_ui/utils.py:3165
+#: weko_search_ui/utils.py:2955 weko_search_ui/utils.py:3112
+#: weko_search_ui/utils.py:3123 weko_search_ui/utils.py:3192
msgid "Specified Prefix of {} is incorrect."
msgstr ""
-#: weko_search_ui/utils.py:2936 weko_search_ui/utils.py:3079
-#: weko_search_ui/utils.py:3089
+#: weko_search_ui/utils.py:2963 weko_search_ui/utils.py:3106
+#: weko_search_ui/utils.py:3116
msgid "{} cannot be set."
msgstr ""
-#: weko_search_ui/utils.py:2945 weko_search_ui/utils.py:2949
-#: weko_search_ui/utils.py:3018 weko_search_ui/utils.py:3206
+#: weko_search_ui/utils.py:2972 weko_search_ui/utils.py:2976
+#: weko_search_ui/utils.py:3045 weko_search_ui/utils.py:3233
msgid "Specified {} is different from existing {}."
msgstr ""
-#: weko_search_ui/utils.py:2969
+#: weko_search_ui/utils.py:2996
msgid ""
"When assigning a DOI to an item, it must be associated with an index "
"whose index status is \"Public\" and Harvest Publishing is \"Public\"."
msgstr ""
-#: weko_search_ui/utils.py:2974
+#: weko_search_ui/utils.py:3001
msgid ""
"Since the item has a DOI, it must be associated with an index whose index"
" status is \"Public\" and whose Harvest Publishing is \"Public\"."
msgstr ""
-#: weko_search_ui/utils.py:2985
+#: weko_search_ui/utils.py:3012
msgid "You cannot keep an item private because it has a DOI."
msgstr ""
-#: weko_search_ui/utils.py:3039 weko_search_ui/utils.py:4335
+#: weko_search_ui/utils.py:3066 weko_search_ui/utils.py:4362
msgid "DOI_RA should be set by one of JaLC, Crossref, DataCite, NDL JaLC."
msgstr ""
-#: weko_search_ui/utils.py:3122
+#: weko_search_ui/utils.py:3149
msgid "Specified DOI was withdrawn. Please specify another DOI."
msgstr ""
-#: weko_search_ui/utils.py:3130
+#: weko_search_ui/utils.py:3157
msgid ""
"Specified DOI has been used already for another item. Please specify "
"another DOI."
msgstr ""
-#: weko_search_ui/utils.py:3226
+#: weko_search_ui/utils.py:3253
msgid ""
"Specified DOI is duplicated with another import item. Please specify "
"another DOI."
msgstr ""
-#: weko_search_ui/utils.py:3259
+#: weko_search_ui/utils.py:3286
msgid "Item Link type: '{}' is not one of {}."
msgstr ""
-#: weko_search_ui/utils.py:3263
+#: weko_search_ui/utils.py:3290
msgid "Please specify Item URL for item link."
msgstr ""
-#: weko_search_ui/utils.py:3277
+#: weko_search_ui/utils.py:3304
msgid "Specified Item Link URI and system URI do not match."
msgstr ""
-#: weko_search_ui/utils.py:3283
+#: weko_search_ui/utils.py:3310
msgid "Linking item does not exist in the system."
msgstr ""
-#: weko_search_ui/utils.py:3286
+#: weko_search_ui/utils.py:3313
msgid "Linking item already deleted in the system."
msgstr ""
-#: weko_search_ui/utils.py:3325
+#: weko_search_ui/utils.py:3352
msgid "It is not allowed to create links to the item itself."
msgstr ""
-#: weko_search_ui/utils.py:3330
+#: weko_search_ui/utils.py:3357
msgid "It is not allowed to create links other than {} between split items."
msgstr ""
-#: weko_search_ui/utils.py:3366
+#: weko_search_ui/utils.py:3393
msgid "Duplicate Item Link."
msgstr ""
-#: weko_search_ui/utils.py:3403
+#: weko_search_ui/utils.py:3430
msgid "'wk:metadataReplace' flag cannot be used when registering an item."
msgstr ""
-#: weko_search_ui/utils.py:3720
+#: weko_search_ui/utils.py:3747
msgid ""
"One of the following required values has not been "
"registered.{{ $t(message) + (code ? ' (' + code + ')' : '') }}
+
+ {{ $t('message.error.oauthError', { time: transitionSecond }) }}
+ {{ loginPage }}
+ {{ code ? ' (' + code + ')' : '' }}
+
+ {{ $t(message) + (code ? ' (' + code + ')' : '') }}
({
+ msgid: '',
+ msgstr: '',
+ position: '',
+ width: 'w-full',
+ loglevel: 'info'
+ })
}
});
@@ -152,4 +143,8 @@ defineProps({
/////////////////////////////////// */
const emits = defineEmits(['clickClose']);
+const appConf = useAppConfig();
+const transitionSecond = appConf.transitionTimeMs / 1000;
+const loginPage = window.location.origin + `${appConf.amsPath ?? ''}/login?source=detail`;
+const { msgid: code, msgstr: message, position, width, loglevel: type } = toRefs(props.alert);
diff --git a/nginx/ams/weko-frontend/components/common/Footer.vue b/nginx/ams/weko-frontend/components/common/Footer.vue
index 8f171b59ab..b79ded1e42 100644
--- a/nginx/ams/weko-frontend/components/common/Footer.vue
+++ b/nginx/ams/weko-frontend/components/common/Footer.vue
@@ -24,7 +24,7 @@
-->
-
+
CONTACT
@@ -56,7 +56,7 @@
-
@@ -70,6 +70,12 @@
diff --git a/nginx/ams/weko-frontend/components/common/SearchForm.vue b/nginx/ams/weko-frontend/components/common/SearchForm.vue
index 166da2a572..2525739efb 100644
--- a/nginx/ams/weko-frontend/components/common/SearchForm.vue
+++ b/nginx/ams/weko-frontend/components/common/SearchForm.vue
@@ -200,7 +200,7 @@
@@ -325,6 +325,7 @@ const titleSearchType = reactive({
name: 'exactMatch'
}
});
+const appConf = useAppConfig();
/* ///////////////////////////////////
// function
@@ -414,7 +415,7 @@ function search() {
emits('clickSearch');
} else {
sessionStorage.setItem('conditions', JSON.stringify(conditions));
- navigateTo('/search');
+ navigateTo(`${appConf.amsPath ?? ''}/search`);
}
}
@@ -592,6 +593,7 @@ try {
$fetch(useAppConfig().wekoApi + '/records', {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
+ credentials: 'omit',
headers: {
'Cache-Control': 'no-store',
Pragma: 'no-cache',
@@ -610,6 +612,7 @@ try {
$fetch(useAppConfig().wekoApi + '/records', {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
+ credentials: 'omit',
headers: {
'Cache-Control': 'no-store',
Pragma: 'no-cache',
@@ -643,6 +646,7 @@ try {
await $fetch(useAppConfig().wekoApi + '/tree/index', {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
+ credentials: 'omit',
headers: {
'Cache-Control': 'no-store',
Pragma: 'no-cache',
diff --git a/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue b/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue
index 90488fe568..f623380bf7 100644
--- a/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue
+++ b/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue
@@ -7,7 +7,7 @@
-
@@ -55,6 +55,7 @@ defineExpose({
/////////////////////////////////// */
const modalShowFlag = ref(false);
+const appConf = useAppConfig();
/* ///////////////////////////////////
// function
diff --git a/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue b/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue
index 7f805c4ed4..29756cd2e6 100644
--- a/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue
+++ b/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue
@@ -10,7 +10,7 @@
-
([]);
const selected = ref(selectorDefault);
let selector = JSON.parse(JSON.stringify(DetailColumn));
+const appConf = useAppConfig();
/* ///////////////////////////////////
// function
@@ -280,7 +281,7 @@ function search() {
closeModal();
} else {
sessionStorage.setItem('conditions', JSON.stringify(conditions));
- navigateTo('/search');
+ navigateTo(`${appConf.amsPath ?? ''}/search`);
closeModal();
}
}
@@ -358,6 +359,7 @@ try {
await $fetch(useAppConfig().wekoApi + '/tree/index', {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
+ credentials: 'omit',
headers: {
'Cache-Control': 'no-store',
Pragma: 'no-cache',
diff --git a/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue b/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue
index e41ee1c1fb..96b706df0d 100644
--- a/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue
+++ b/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue
@@ -10,7 +10,7 @@
-
@@ -192,7 +192,7 @@ function getCaptcha() {
dirtyAnswer.value = false;
answeResult.value = false;
- $fetch(appConf.wekoApi + '/captcha/image', {
+ $fetch(`${appConf.amsApi ?? '/api'}/captcha/image`, {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
headers: {
@@ -227,7 +227,7 @@ async function send() {
locale.value = String(localStorage.getItem('locale'));
const contactType = t(props.type);
- await useFetch('/api/mail/send', {
+ await useFetch(`${appConf.amsApi ?? '/api'}/mail/send`, {
method: 'POST',
body: JSON.stringify({
key: captchaKey,
diff --git a/nginx/ams/weko-frontend/components/detail/DownloadRank.vue b/nginx/ams/weko-frontend/components/detail/DownloadRank.vue
index e359364acf..f03228eec2 100644
--- a/nginx/ams/weko-frontend/components/detail/DownloadRank.vue
+++ b/nginx/ams/weko-frontend/components/detail/DownloadRank.vue
@@ -43,6 +43,7 @@
diff --git a/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue b/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue
index 53e7251e78..b7c7ac3dd4 100644
--- a/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue
+++ b/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue
@@ -30,6 +30,7 @@
diff --git a/nginx/ams/weko-frontend/components/search/SummaryStyle.vue b/nginx/ams/weko-frontend/components/search/SummaryStyle.vue
index 2c51e03f2d..81e231c7da 100644
--- a/nginx/ams/weko-frontend/components/search/SummaryStyle.vue
+++ b/nginx/ams/weko-frontend/components/search/SummaryStyle.vue
@@ -66,7 +66,7 @@
to=""
event=""
style="cursor: pointer"
- @click="throughDblClick(`/detail?sess=search&number=${item.id}`)">
+ @click="throughDblClick(`${appConf.amsPath ?? ''}/detail?sess=search&number=${item.id}`)">
{{ itemInfo[appConf.roCrate.root.title][0] }}
@@ -130,7 +130,7 @@
{{ $t('file') + '：' }}
-
+
{{ $t('unexist') }}
+ @click="throughDblClick(`${appConf.amsPath ?? ''}/files?number=${item.id}`)">
{{ $t('exist') + `（${getFileLength(itemInfo.mainEntity)}）` }}
@@ -150,18 +150,18 @@
@@ -202,7 +202,7 @@ const thumbnailName = Object.prototype.hasOwnProperty.call(itemInfo, appConf.roC
? itemInfo[appConf.roCrate.root.thumbnail][0]
: '';
const loading = ref(true);
-const thumbnailPath = ref('/img/noimage_thumbnail.jpg');
+const thumbnailPath = ref(appConf.amsImage + '/noimage_thumbnail.jpg');
/* ///////////////////////////////////
// function
@@ -247,6 +247,7 @@ onMounted(() => {
$fetch(appConf.wekoApi + '/records/' + props.item.id + '/files/' + thumbnailName, {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'GET',
+ credentials: 'omit',
headers: {
'Cache-Control': 'no-store',
Pragma: 'no-cache',
@@ -283,37 +284,37 @@ onMounted(() => {
const field = itemInfo[appConf.roCrate.root.field][0];
// 自然科学一般|Natural Science
if (field.includes('自然科学一般') || /Natural\s?Science/.test(field)) {
- thumbnailPath.value = '/img/naturalScience-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/naturalScience-sample.png';
// ライフサイエンス|Life Science
} else if (field.includes('ライフサイエンス') || /Life\s?Science/.test(field)) {
- thumbnailPath.value = '/img/lifeScience-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/lifeScience-sample.png';
// 情報通信|Informatics
} else if (field.includes('情報通信') || field.includes('Informatics')) {
- thumbnailPath.value = '/img/informatics-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/informatics-sample.png';
// 環境|Environmental science
} else if (field.includes('環境') || /Environmental\s?science/.test(field)) {
- thumbnailPath.value = '/img/environmental-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/environmental-sample.png';
// ナノテク・材料|Nanotechnology/Materials
} else if (/ナノテク\s?・?\s?材料/.test(field) || /Nanotechnology\s?\/?\s?Materials/.test(field)) {
- thumbnailPath.value = '/img/nanotech-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/nanotech-sample.png';
// エネルギー|Energy Engineering
} else if (field.includes('エネルギー') || /Energy\s?Engineering/.test(field)) {
- thumbnailPath.value = '/img/energy-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/energy-sample.png';
// ものづくり技術|Manufacturing Technology
} else if (field.includes('ものづくり技術') || /Manufacturing\s?Technology/.test(field)) {
- thumbnailPath.value = '/img/manufacturing-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/manufacturing-sample.png';
// 社会基盤|Social Infrastructure
} else if (field.includes('社会基盤') || /Social\s?Infrastructure/.test(field)) {
- thumbnailPath.value = '/img/social-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/social-sample.png';
// フロンティア|Frontier Technology
} else if (field.includes('フロンティア') || /Frontier\s?Technology/.test(field)) {
- thumbnailPath.value = '/img/frontier-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/frontier-sample.png';
// 人文・社会|Humanities & Social Sciences
} else if (/人文\s?・?\s?社会/.test(field) || /Humanities\s?&?\s?Social\s?Sciences/.test(field)) {
- thumbnailPath.value = '/img/humanities-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/humanities-sample.png';
// その他|Others
} else if (field.includes('その他') || field.includes('Others')) {
- thumbnailPath.value = '/img/others-sample.png';
+ thumbnailPath.value = appConf.amsImage + '/others-sample.png';
}
}
});
diff --git a/nginx/ams/weko-frontend/composables/refreshToken.ts b/nginx/ams/weko-frontend/composables/refreshToken.ts
index 6a746278d5..bab49021a5 100644
--- a/nginx/ams/weko-frontend/composables/refreshToken.ts
+++ b/nginx/ams/weko-frontend/composables/refreshToken.ts
@@ -1,13 +1,14 @@
export default function () {
const expires = Number(localStorage.getItem('token:expires'));
const issue = Number(localStorage.getItem('token:issue')) ?? 0;
+ const appConf = useAppConfig();
if (expires) {
if (
issue + expires * 1000 >= Date.now() &&
issue + (expires - useRuntimeConfig().public.tokenRefreshLimit) * 1000 <= Date.now()
) {
- useFetch('/api/token/refresh', {
+ useFetch(`${appConf.amsApi ?? '/api'}/token/refresh`, {
method: 'GET',
params: { refreshToken: String(localStorage.getItem('token:refresh')) }
}).then((response) => {
diff --git a/nginx/ams/weko-frontend/locales/en.json b/nginx/ams/weko-frontend/locales/en.json
index 372503b968..08ac4ab747 100644
--- a/nginx/ams/weko-frontend/locales/en.json
+++ b/nginx/ams/weko-frontend/locales/en.json
@@ -155,7 +155,8 @@
"mail": "Enter your email address",
"contents": "Enter your inquiry details",
"contactType": "Enter contact type",
- "request": "Enter your request"
+ "request": "Enter your request",
+ "result": "Enter result"
},
"alert": {
"requiredField": "This field is required",
@@ -172,6 +173,7 @@
"error": "Error has occurred. Please contact server administrator.",
"server": "Server error has occurred. Please contact server administrator.",
"auth": "Authentication error has occurred. Authentication status is invalid.",
+ "noItemAuth": "You do not have permission to view this item.",
"fetch": "Failed to send data.",
"login": "Failed to login.",
"search": "Failed to search items.",
@@ -185,7 +187,14 @@
"getItemDetail": "Failed to get item details.",
"getItemViewsNumber": "Failed to get the number of views for the item.",
"getDownloadRanking": "Failed to get download ranking.",
- "getFileDlNumber": "Failed to get the number of downloaded."
+ "getFileDlNumber": "Failed to get the number of downloaded.",
+ "loginFailed": "Failed to Login. Please contact server administrator.",
+ "noUserInformation": "There is no user information.",
+ "oauthError": "Login is required to view items. You will be automatically redirected to the login screen in {time} seconds. Login screen:"
+ },
+ "copySearch": {
+ "copySuccess": "URL copied to clipboard.",
+ "copyFailed": "Copy failed."
}
},
"overview": "Overview",
@@ -293,5 +302,7 @@
"conflictOfInterestYes": "conflict of interest (Yes) ",
"remarks": "Remarks",
"identifierText": "identifier",
- "identifierType": "identifier type"
-}
+ "identifierType": "identifier type",
+ "Institutional Login for institutions in Japan.": "Institutional Login for institutions in Japan.",
+ "needToLogin": "This item requires login."
+}
\ No newline at end of file
diff --git a/nginx/ams/weko-frontend/locales/ja.json b/nginx/ams/weko-frontend/locales/ja.json
index 053f575d3b..ad531a6884 100644
--- a/nginx/ams/weko-frontend/locales/ja.json
+++ b/nginx/ams/weko-frontend/locales/ja.json
@@ -156,7 +156,8 @@
"mail": "メールアドレスを入力",
"contents": "お問い合わせ内容を入力",
"contactType": "お問い合わせ種別を入力",
- "request": "リクエスト内容を入力"
+ "request": "リクエスト内容を入力",
+ "result": "計算結果を入力"
},
"alert": {
"requiredField": "必須入力",
@@ -173,6 +174,7 @@
"error": "エラーが発生しました。管理者に連絡してください。",
"server": "サーバエラーが発生しました。管理者に連絡してください。",
"auth": "認証エラーが発生しました。認証状態が不正です。",
+ "noItemAuth": "アイテムの閲覧権限がありません。",
"fetch": "データ送信に失敗しました。",
"login": "ログインに失敗しました。",
"search": "アイテム検索に失敗しました。",
@@ -186,7 +188,14 @@
"getItemDetail": "アイテム詳細情報の取得に失敗しました。",
"getItemViewsNumber": "アイテムの閲覧数取得に失敗しました。",
"getDownloadRanking": "ダウンロードランキングの取得に失敗しました。",
- "getFileDlNumber": "ファイルのダウンロード数取得に失敗しました。"
+ "getFileDlNumber": "ファイルのダウンロード数取得に失敗しました。",
+ "loginFailed": "ログインに失敗しました。管理者に連絡してください。",
+ "noUserInformation": "ユーザ情報がありません。",
+ "oauthError": "アイテム閲覧にはログインが必要です。{time} 秒後にログイン画面に遷移します。ログイン画面："
+ },
+ "copySearch": {
+ "copySuccess": "URLをクリップボードにコピーしました。",
+ "copyFailed": "コピーに失敗しました。"
}
},
"overview": "概要",
@@ -294,5 +303,7 @@
"conflictOfInterestYes": "利益相反の有無（有の場合）",
"remarks": "備考",
"identifierText": "識別子",
- "identifierType": "識別子タイプ"
-}
+ "identifierType": "識別子タイプ",
+ "Institutional Login for institutions in Japan.": "所属機関のIdPでログインする方",
+ "needToLogin": "ログインが必要なアイテムです。"
+}
\ No newline at end of file
diff --git a/nginx/ams/weko-frontend/nuxt.config.ts b/nginx/ams/weko-frontend/nuxt.config.ts
index 20df6d4800..30ce604dfb 100644
--- a/nginx/ams/weko-frontend/nuxt.config.ts
+++ b/nginx/ams/weko-frontend/nuxt.config.ts
@@ -17,6 +17,7 @@ export default defineNuxtConfig({
css: ['@/assets/sass/styles.scss'],
ssr: false,
app: {
+ buildAssetsDir: '/ams/_nuxt/',
head: {
htmlAttrs: { lang: 'ja' },
title: 'AMS-alpha',
diff --git a/nginx/ams/weko-frontend/pages/contact.vue b/nginx/ams/weko-frontend/pages/ams/contact.vue
similarity index 96%
rename from nginx/ams/weko-frontend/pages/contact.vue
rename to nginx/ams/weko-frontend/pages/ams/contact.vue
index 7a321f268a..fb3210b27d 100644
--- a/nginx/ams/weko-frontend/pages/contact.vue
+++ b/nginx/ams/weko-frontend/pages/ams/contact.vue
@@ -169,19 +169,14 @@
-
{{ $t('comment') }}
-
+
-
-
-
+
{{ $t('logout') }}
@@ -49,13 +49,14 @@
/////////////////////////////////// */
const isLogout = ref(false);
+const appConf = useAppConfig();
/* ///////////////////////////////////
// function
/////////////////////////////////// */
function logout() {
- $fetch(useAppConfig().wekoApi + '/logout', {
+ $fetch(appConf.wekoApi + '/logout', {
timeout: useRuntimeConfig().public.apiTimeout,
method: 'POST',
onResponse() {
diff --git a/nginx/ams/weko-frontend/pages/preview.vue b/nginx/ams/weko-frontend/pages/ams/preview.vue
similarity index 100%
rename from nginx/ams/weko-frontend/pages/preview.vue
rename to nginx/ams/weko-frontend/pages/ams/preview.vue
diff --git a/nginx/ams/weko-frontend/pages/search/[id].vue b/nginx/ams/weko-frontend/pages/ams/search/[id].vue
similarity index 76%
rename from nginx/ams/weko-frontend/pages/search/[id].vue
rename to nginx/ams/weko-frontend/pages/ams/search/[id].vue
index d53bfbc6ef..d758860507 100644
--- a/nginx/ams/weko-frontend/pages/search/[id].vue
+++ b/nginx/ams/weko-frontend/pages/ams/search/[id].vue
@@ -6,16 +6,13 @@
-
+
{{ index.name }}
{{ index.name }}
- /
+ /
@@ -109,16 +106,14 @@
-
+
+ 
+ 
+