From cc6538a429ad1e9eb9455a4db62f246cf741ce01 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Wed, 24 Jan 2024 17:27:30 +0100
Subject: [PATCH] MAINT: Revert changes in crawl.py for merge with f-fix-merge
---
src/caoscrawler/crawl.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py
index 2ef68740..32ad2a34 100644
--- a/src/caoscrawler/crawl.py
+++ b/src/caoscrawler/crawl.py
@@ -602,7 +602,7 @@ class Crawler(object):
# We merge the two in order to prevent loss of information
newrecord = self.get_from_any_cache(identifiable)
try:
- merge_entities(newrecord, record, merge_id_with_resolved_entity=True)
+ merge_entities(newrecord, record)
except EntityMergeConflictError:
continue
Crawler.bend_references_to_new_object(
@@ -639,14 +639,7 @@ class Crawler(object):
resolved_references = True
for record in flat:
- try:
- self.replace_references_with_cached(record, referencing_entities)
- except RuntimeError as re:
- # TODO: This resolves
- # https://gitlab.indiscale.com/caosdb/customers/leibniz-zmt/management/-/issues/258,
- # but why?
- print(f"Record: {record}\n")
- continue
+ self.replace_references_with_cached(record, referencing_entities)
if len(flat) > 0:
circle = self.detect_circular_dependency(flat)
--
GitLab