From aae1490dc215bf264ef19d58acf0b232b5e12d28 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@inidscale.com>
Date: Wed, 24 Jan 2024 15:43:18 +0100
Subject: [PATCH] FIX: Re-introduce continue
---
src/caoscrawler/crawl.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py
index 70e9695e..2ef68740 100644
--- a/src/caoscrawler/crawl.py
+++ b/src/caoscrawler/crawl.py
@@ -601,7 +601,10 @@ 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)
- merge_entities(newrecord, record, merge_id_with_resolved_entity=True)
+ try:
+ merge_entities(newrecord, record, merge_id_with_resolved_entity=True)
+ except EntityMergeConflictError:
+ continue
Crawler.bend_references_to_new_object(
old=record, new=newrecord, entities=flat + to_be_updated + to_be_inserted)
--
GitLab