Updated processing of identifiers in loader.

omnipath_metabo/schema/_main.py

@@ -128,8 +128,6 @@ def load(self):
 
         self.create()
 
-        resource_labels = [self.resource.name] + self.resource.id_types
-
         insert_resource = (
             insert(_structure.Resource).
             values([{'name': l} for l in resource_labels]).
@@ -189,11 +187,14 @@ def load(self):
         _log('resource ids collected.', level = -1)
 
         insert_ids = (
-            (_id, strids[smiles], resource_key, i==0, resource_labels[i])
+            (_id, strids[smiles], resource_key, id_type == self.resource.name, resource.id_types.get(id_type, id_type)
             for name, smiles, _ in (
                 r['structure'] for r in cached_resource.cached['struct']
             )
-            for i, _id in enumerate(itertools.chain((name, ), cached_resource.cached['struct']['identifiers']))
+            for _id, id_type in itertools.chain(
+                (name, self.resource.name), 
+                cached_resource.cached['struct']['identifiers']
+                )
         )
 
         _log('inserting identifiers.', level =-1)

omnipath_metabo/schema/_structure.py

@@ -113,10 +113,7 @@ def __init__(self):
     @classmethod
     def _resource_label(cls) -> str:
 
-        return [
-            _id_types().get(cls.name, {}).get(label, label)
-            for label in cls.id_fields
-        ]
+        return _id_types().get(cls.name, {})