Merge pull request #1857 from ivis-weko3-dev/feature/W2025-33

Feature/w2025 33

Author: kanon-yoneji

modules/invenio-oaiharvester/invenio_oaiharvester/harvester.py

@@ -1453,9 +1453,7 @@ def ddi_harvest_processing(self, harvest_data, res):
         """Process parsing DDI data."""
         def get_mapping_ddi():
             """Get DDI mapping."""
-            item_type_id = self.itemtype.id
-            type_mapping = Mapping.get_record(item_type_id)
-            item_map = get_mapping(type_mapping, "ddi_mapping")
+            item_map = get_mapping(self.itemtype.id, "ddi_mapping")
             lst_keys_x = list(item_map.keys())
             for i in lst_keys_x:
                 lst_keys.append(i)
@@ -1543,7 +1541,7 @@ def parse_to_obj_data_by_mapping_keys(vals, keys):
             def get_same_key_from_form(sub_key):
                 """Get the same key with sub_key in form."""
                 for item_sub_key_form in item_sub_keys_form:
-                    if item_sub_key_form.replace("[]", "") == sub_key:
+                    if item_sub_key_form.replace("[]", "") in sub_key.split(','):
                         sub_key = item_sub_key_form
                         break
                 return sub_key

modules/invenio-oaiharvester/tests/test_harvester.py

@@ -711,13 +711,11 @@ def check_correct_system_props_mapping(object_uuid, system_mapping_config):
 
     Correct mapping mean item map have the 2 field same with config
     """
-    from weko_records.api import ItemsMetadata, Mapping
+    from weko_records.api import ItemsMetadata
     from weko_records.serializers.utils import get_mapping
 
     item_type = ItemsMetadata.get_by_object_id(object_uuid)
-    item_type_id = item_type.item_type_id
-    type_mapping = Mapping.get_record(item_type_id)
-    item_map = get_mapping(type_mapping, "jpcoar_mapping")
+    item_map = get_mapping(item_type.item_type_id, "jpcoar_mapping")
 
     if system_mapping_config:
         for key in system_mapping_config:
@@ -734,49 +732,49 @@ def combine_record_file_urls(record, object_uuid, meta_prefix):
 
     Get file property information by item_mapping and put to metadata.
     """
-    from weko_records.api import ItemsMetadata, Mapping
+    from weko_records.api import ItemsMetadata
     from weko_records.serializers.utils import get_mapping
     from weko_schema_ui.schema import get_oai_metadata_formats
 
     metadata_formats = get_oai_metadata_formats(current_app)
     item_type = ItemsMetadata.get_by_object_id(object_uuid)
-    item_type_id = item_type.item_type_id
-    type_mapping = Mapping.get_record(item_type_id)
     mapping_type = metadata_formats[meta_prefix]['serializer'][1]['schema_type']
-    item_map = get_mapping(type_mapping,
+    item_map = get_mapping(item_type.item_type_id,
                            "{}_mapping".format(mapping_type))
-    file_keys = None
+    file_keys_str = None
     if item_map:
         file_props = current_app.config["OAISERVER_FILE_PROPS_MAPPING"]
         if mapping_type in file_props:
-            file_keys = item_map.get(file_props[mapping_type])
+            file_keys_str = item_map.get(file_props[mapping_type])
         else:
-            file_keys = None
+            file_keys_str = None
 
-    if not file_keys:
+    if not file_keys_str:
         return record
     else:
-        file_keys = file_keys.split('.')
-
-    if len(file_keys) == 3 and record.get(file_keys[0]):
-        attr_mlt = record[file_keys[0]]["attribute_value_mlt"]
-        if isinstance(attr_mlt, list):
-            for attr in attr_mlt:
-                if attr.get('filename'):
-                    if not attr.get(file_keys[1]):
-                        attr[file_keys[1]] = {}
-                    attr[file_keys[1]][file_keys[2]] = create_files_url(
-                        request.url_root,
-                        record.get('recid'),
-                        attr.get('filename'))
-        elif isinstance(attr_mlt, dict) and \
-                attr_mlt.get('filename'):
-            if not attr_mlt.get(file_keys[1]):
-                attr_mlt[file_keys[1]] = {}
-            attr_mlt[file_keys[1]][file_keys[2]] = create_files_url(
-                request.url_root,
-                record.get('recid'),
-                attr_mlt.get('filename'))
+        file_keys = file_keys_str.split(',')
+
+    for file_key in file_keys:
+        key = file_key.split('.')
+        if len(key) == 3 and record.get(key[0]):
+            attr_mlt = record[key[0]]["attribute_value_mlt"]
+            if isinstance(attr_mlt, list):
+                for attr in attr_mlt:
+                    if attr.get('filename'):
+                        if not attr.get(key[1]):
+                            attr[key[1]] = {}
+                        attr[key[1]][key[2]] = create_files_url(
+                            request.url_root,
+                            record.get('recid'),
+                            attr.get('filename'))
+            elif isinstance(attr_mlt, dict) and \
+                    attr_mlt.get('filename'):
+                if not attr_mlt.get(key[1]):
+                    attr_mlt[key[1]] = {}
+                attr_mlt[key[1]][key[2]] = create_files_url(
+                    request.url_root,
+                    record.get('recid'),
+                    attr_mlt.get('filename'))
 
     return record
 

modules/invenio-oaiserver/invenio_oaiserver/response.py

@@ -14,6 +14,9 @@
 import pickle
 
 import pytz
+import traceback
+
+from flask import current_app
 from weko_records.api import Mapping
 
 from invenio_records_rest.config import RECORDS_REST_DEFAULT_MAPPING_DICT
@@ -155,51 +158,76 @@ def get_keys(arr):
         def get_mapping(item_type_id):
             """Get keys of metadata record by mapping."""
             # Get default mapping key and lang from config (defaults are None).
+            from weko_items_ui.utils import get_options_and_order_list, get_hide_list_by_schema_form
+            from weko_records.api import ItemTypes
+
             mapping_dict = RECORDS_REST_DEFAULT_MAPPING_DICT
             # Get mapping of this record.
-            mapping = Mapping.get_record(item_type_id)
-            if not mapping:
+            meta_option, item_type_mapping = get_options_and_order_list(item_type_id)
+            item_type = ItemTypes.get_by_id(item_type_id)
+            item_type_list = None
+            if item_type:
+                item_type_list = item_type.render.get('table_row')
+            hide_list = get_hide_list_by_schema_form(item_type_id)
+            if not item_type_mapping or not item_type_list:
                 return mapping_dict
             # Update default mapping key and lang by mapping of this record.
             identifier = 'system_identifier'
-            for k, v in mapping.items():
-                if not type(v.get('jpcoar_mapping')) is dict:
-                    continue
-                for k1, v1 in v.get('jpcoar_mapping').items():
-                    for k2, v2 in mapping_dict.items():
-                        if k1 != k2.split(':')[1] or not type(v1) is dict:
+            for k in item_type_list:
+                if k in item_type_mapping:
+                    v = item_type_mapping.get(k)
+                    prop_hidden = meta_option.get(k, {}).get('option', {}).get('hidden', False)
+                    if not type(v.get('jpcoar_mapping')) is dict \
+                            or prop_hidden:
+                        continue
+                    for k1, v1 in v.get('jpcoar_mapping').items():
+                        skip_flag = False
+                        for h in hide_list:
+                            if h.startswith(k) and \
+                                    (('@value' in v1.keys() and
+                                    h.endswith(v1.get('@value').split('.')[-1])) or \
+                                    ('creatorName' in v1.keys() and
+                                    h.endswith(v1.get('creatorName', {}).get('@value').split('.')[-1]))):
+                                skip_flag = True
+                        if skip_flag:
                             continue
-                        key = identifier if identifier in k else k
-                        key_arr = ['metadata', key, 'attribute_value_mlt', 0]
-                        lang_arr = key_arr.copy()
-                        if k1 == 'creator':
-                            name = v1.get('creatorName')
-                            # Set all key for __lang
-                            attr = name.get('@attributes', {})
-                            xml_lang = attr.get('xml:lang', '').split('.')
-                            lang_arr.extend(get_keys(xml_lang))
-                            # Set all key for key
-                            name_arr = name.get('@value').split('.')
-                            key_arr.extend(get_keys(name_arr))
-                        elif '.' in v1.get('@value', ''):
-                            # Set key for __lang
-                            attr = v1.get('@attributes', {})
-                            xml_lang = attr.get('xml:lang', '').split('.')
-                            lang_arr.extend(get_keys(xml_lang))
-                            # Set all key for key
-                            name_arr = v1.get('@value').split('.')
-                            key_arr.extend(get_keys(name_arr))
-                        else:
-                            # Set key for __lang
-                            attr = v1.get('@attributes', {})
-                            lang_arr.append(attr.get('xml:lang'))
-                            # Set all key for key
-                            key_arr.append(v1.get('@value'))
-                        mapping_dict[k2] = key_arr
-                        mapping_dict['{}__lang'.format(k2)] = lang_arr
+                        for k2, v2 in mapping_dict.items():
+                            if k1 != k2.split(':')[1] or \
+                                    not type(v1) is dict or \
+                                    mapping_dict[k2]:
+                                continue
+                            key = identifier if identifier in k else k
+                            key_arr = ['metadata', key, 'attribute_value_mlt', 0]
+                            lang_arr = key_arr.copy()
+                            if k1 == 'creator':
+                                name = v1.get('creatorName')
+                                # Set all key for __lang
+                                attr = name.get('@attributes', {})
+                                xml_lang = attr.get('xml:lang', '').split('.')
+                                lang_arr.extend(get_keys(xml_lang))
+                                # Set all key for key
+                                name_arr = name.get('@value').split('.')
+                                key_arr.extend(get_keys(name_arr))
+                            elif '.' in v1.get('@value', ''):
+                                # Set key for __lang
+                                attr = v1.get('@attributes', {})
+                                xml_lang = attr.get('xml:lang', '').split('.')
+                                lang_arr.extend(get_keys(xml_lang))
+                                # Set all key for key
+                                name_arr = v1.get('@value').split('.')
+                                key_arr.extend(get_keys(name_arr))
+                            else:
+                                # Set key for __lang
+                                attr = v1.get('@attributes', {})
+                                lang_arr.append(attr.get('xml:lang'))
+                                # Set all key for key
+                                key_arr.append(v1.get('@value'))
+                            mapping_dict[k2] = key_arr
+                            mapping_dict['{}__lang'.format(k2)] = lang_arr
             return mapping_dict
 
         links_factory = links_factory or (lambda x, record=None, **k: dict())
+
         metadata = pickle.loads(pickle.dumps(record.replace_refs(), -1)) if self.replace_refs \
             else record.dumps()
         # Get keys of metadata record by mapping.