Skip to content
Snippets Groups Projects

F fix comparison

Merged Alexander Schlemmer requested to merge f-fix-comparison into dev
All threads resolved!
Files
2
+ 6
5
# -*- coding: utf-8 -*-
#
# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
# Copyright (C) 2020 Timm Fitschen <t.fitschen@indiscale.com>
# Copyright (C) 2020 IndiScale GmbH <info@indiscale.com>
# Copyright (C) 2020-2022 IndiScale GmbH <info@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -109,7 +108,7 @@ def retrieve_entities_with_ids(entities):
for i in range(len(entities)//step+1):
collection.extend(
execute_query(
create_id_query(entities[i*step:(i+1)*step])))
create_id_query(entities[i*step:(i+1)*step])))
return collection
@@ -561,6 +560,7 @@ def getCommitIn(folder):
COMPARED = ["name", "role", "datatype", "description", "importance",
"id", "path", "checksum", "size"]
def compare_entities(old_entity: Entity, new_entity: Entity):
"""
Compare two entites.
@@ -613,7 +613,7 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
if new_entity_attr_exists:
newdiff[attr] = newattr
# properties
for prop in old_entity.properties:
@@ -653,7 +653,8 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
olddiff["properties"].pop(prop.name)
else:
raise NotImplementedError("Comparison not implemented for multi-properties.")
raise NotImplementedError(
"Comparison not implemented for multi-properties.")
for prop in new_entity.properties:
if len([0 for p in old_entity.properties if p.name == prop.name]) == 0:
Loading