Merge pull request #358 from nada-ben-ali/NaBe/priority_should_be_giv…

…en_to_local_refs Priority should be given to local refs
mercedes-benz · Oct 30, 2024 · f972a30 · f972a30
2 parents 98e09b3 + b53bdb0
commit f972a30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/odxtools/diaglayers/diaglayer.py b/odxtools/diaglayers/diaglayer.py
@@ -124,7 +124,7 @@ def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
             # imported references only apply within this specific
             # diagnostic layer
             extended_odxlinks = copy(odxlinks)
-            extended_odxlinks.update(imported_links)
+            extended_odxlinks.update(imported_links, overwrite=False)
 
             self.diag_layer_raw._resolve_odxlinks(extended_odxlinks)
             return

diff --git a/odxtools/odxlink.py b/odxtools/odxlink.py
@@ -230,7 +230,7 @@ def resolve_lenient(self,
 
         return None
 
-    def update(self, new_entries: Dict[OdxLinkId, Any]) -> None:
+    def update(self, new_entries: Dict[OdxLinkId, Any], *, overwrite: bool = True) -> None:
         """
         Add a bunch of new objects to the ODXLINK database.
 
@@ -244,7 +244,10 @@ def update(self, new_entries: Dict[OdxLinkId, Any]) -> None:
                 if doc_frag not in self._db:
                     self._db[doc_frag] = {}
 
-                self._db[doc_frag][odx_id.local_id] = obj
+                if overwrite:
+                    self._db[doc_frag][odx_id.local_id] = obj
+                else:
+                    self._db[doc_frag].setdefault(odx_id.local_id, obj)
 
 
 @overload