From b11ca9e4a45b814dc4b7c02eaaeefbc0c01e2195 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Thu, 16 Feb 2023 14:44:38 +0100
Subject: [PATCH] SSDM-13343 : Allow modifying properties without needing to
upgrade the type version
---
.../openbis/generic/server/xls/importer/XLSImport.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java
index b878c147aea..7be3a4c0ba7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java
@@ -141,11 +141,10 @@ public class XLSImport
// parse and create scripts
scriptHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2, ScriptTypes.VALIDATION_SCRIPT);
// parse and create sample type
- boolean sTisNewVersion = sampleTypeHelper.isNewVersion(page, pageNumber, lineNumber, lineNumber + 2);
sampleTypeHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2);
semanticAnnotationImportHelper.importBlockForEntityType(page, pageNumber, lineNumber, lineNumber + 2, ImportTypes.SAMPLE_TYPE);
// parse and assignment properties
- if (sTisNewVersion && lineNumber + 2 != blockEnd)
+ if (lineNumber + 2 != blockEnd)
{
scriptHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd, ScriptTypes.DYNAMIC_SCRIPT);
propertyHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd);
@@ -157,11 +156,10 @@ public class XLSImport
// parse and create scripts
scriptHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2, ScriptTypes.VALIDATION_SCRIPT);
// parse and create experiment type
- boolean eTisNewVersion = experimentTypeHelper.isNewVersion(page, pageNumber, lineNumber, lineNumber + 2);
experimentTypeHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2);
semanticAnnotationImportHelper.importBlockForEntityType(page, pageNumber, lineNumber, lineNumber + 2, ImportTypes.EXPERIMENT_TYPE);
// parse and assignment properties
- if (eTisNewVersion && lineNumber + 2 != blockEnd)
+ if (lineNumber + 2 != blockEnd)
{
scriptHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd, ScriptTypes.DYNAMIC_SCRIPT);
propertyHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd);
@@ -173,11 +171,10 @@ public class XLSImport
// parse and create scripts
scriptHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2, ScriptTypes.VALIDATION_SCRIPT);
// parse and create dataset type
- boolean dTisNewVersion = datasetTypeHelper.isNewVersion(page, pageNumber, lineNumber, lineNumber + 2);
datasetTypeHelper.importBlock(page, pageNumber, lineNumber, lineNumber + 2);
semanticAnnotationImportHelper.importBlockForEntityType(page, pageNumber, lineNumber, lineNumber + 2, ImportTypes.DATASET_TYPE);
// parse and assignment properties
- if (dTisNewVersion && lineNumber + 2 != blockEnd)
+ if (lineNumber + 2 != blockEnd)
{
scriptHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd, ScriptTypes.DYNAMIC_SCRIPT);
propertyHelper.importBlock(page, pageNumber, lineNumber + 2, blockEnd);
--
GitLab