diff --git a/setup.cfg b/setup.cfg index dc2f737877e14ee789e9d884573a3b1808f48631..fedee42ab158adfcf19fd8103fcf67f2c52c7099 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,7 +21,7 @@ python_requires = >=3.7 install_requires = importlib-resources caosadvancedtools >= 0.7.0 - linkahead >= 0.13.3 + linkahead > 0.13.2 yaml-header-tools >= 0.2.1 pyyaml odfpy #make optional diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py index 7b05120b3f609368528cd83ed0c5ab3b0a0ad9f1..70e9695e28cc7e5c2b78aef716d24eea741dc4f1 100644 --- a/src/caoscrawler/crawl.py +++ b/src/caoscrawler/crawl.py @@ -601,10 +601,7 @@ class Crawler(object): elif self.get_from_any_cache(identifiable) is not None: # We merge the two in order to prevent loss of information newrecord = self.get_from_any_cache(identifiable) - try: - merge_entities(newrecord, record) - except EntityMergeConflictError: - continue + merge_entities(newrecord, record, merge_id_with_resolved_entity=True) Crawler.bend_references_to_new_object( old=record, new=newrecord, entities=flat + to_be_updated + to_be_inserted)