Skip to content
Snippets Groups Projects
Commit b11ca9e4 authored by juanf's avatar juanf
Browse files

SSDM-13343 : Allow modifying properties without needing to upgrade the type version

parent dd81f448
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment