From e1217f43a5f8e4de1e1adc9bd3a739ff1ac5a2b7 Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Thu, 17 Mar 2022 12:27:20 +0100
Subject: [PATCH] FIX: problem when importance keyword was not present in diff
output
---
src/caosdb/apiutils.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py
index e6bd80fb..d90ef0d5 100644
--- a/src/caosdb/apiutils.py
+++ b/src/caosdb/apiutils.py
@@ -356,8 +356,13 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
for key in diff_r2["properties"]:
if key in diff_r1["properties"]:
- if (diff_r1["properties"][key]["importance"] !=
- diff_r2["properties"][key]["importance"]):
+ if ("importance" in diff_r1["properties"][key] and
+ "importance" in diff_r2["properties"][key]):
+ if (diff_r1["properties"][key]["importance"] !=
+ diff_r2["properties"][key]["importance"]):
+ raise NotImplementedError()
+ elif ("importance" in diff_r1["properties"][key] or
+ "importance" in diff_r2["properties"][key]):
raise NotImplementedError()
for attribute in ("datatype", "unit", "value"):
--
GitLab