From 8e4bf91418d9e1594bfcd41b36ceb4417c3461b7 Mon Sep 17 00:00:00 2001
From: Cezary Czernecki <ccezary@ethz.ch>
Date: Thu, 6 Jun 2019 13:56:22 +0200
Subject: [PATCH] SSDM-7270 proper version assignment
---
.../xls-import/1/as/services/xls-import-api/entrypoint.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/entrypoint.py b/openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/entrypoint.py
index e93c72755e2..05f48da3251 100644
--- a/openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/entrypoint.py
+++ b/openbis_standard_technologies/dist/core-plugins/xls-import/1/as/services/xls-import-api/entrypoint.py
@@ -97,7 +97,7 @@ def process(context, parameters):
if code in versioning_information:
version = versioning_information[code]
else:
- version = creations_metadata.get_metadata_for(creation_type, creation).version
+ version = creations_metadata.get_metadata_for(creation_type, creation).version if update_mode != "UPDATE_IF_EXISTS" else 0
versioning_information[code] = int(version)
else:
versioning_information = {}
@@ -105,17 +105,15 @@ def process(context, parameters):
if creation_type in versionable_types:
for creation in creation_collection:
code = get_metadata_name_for(creation_type, creation)
- versioning_information[code] = creations_metadata.get_metadata_for(creation_type, creation).version
+ versioning_information[code] = creations_metadata.get_metadata_for(creation_type, creation).version if update_mode != "UPDATE_IF_EXISTS" else 0
existing_elements = search_engine.find_all_existing_elements(creations)
entity_kinds = search_engine.find_existing_entity_kind_definitions_for(creations)
existing_vocabularies = search_engine.find_all_existing_vocabularies()
-
existing_unified_kinds = unify_properties_representation_of(creations, entity_kinds, existing_vocabularies, existing_elements)
creations = PropertiesLabelHandler.rewrite_property_labels_to_codes(creations, existing_unified_kinds)
server_duplicates_handler = OpenbisDuplicatesHandler(creations, creations_metadata, existing_elements,
versioning_information, update_mode)
-
creations = server_duplicates_handler.rewrite_parentchild_creationid_to_permid()
creations = server_duplicates_handler.handle_existing_elements_in_creations()
operations = CreationOrUpdateToOperationParser.parse(creations)
--
GitLab