From ab64e76c59e3e24180552a46b9a4f5c490da4923 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Wed, 6 Feb 2019 13:56:57 +0100
Subject: [PATCH] SSDM-7158: Respecting config flag
translate-using-data-source-alias correctly
---
.../sync/harvester/config/SynchronizationConfigReader.java | 2 +-
.../sync/harvester/synchronizer/EntitySynchronizer.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
index 2baa5433060..8872f935bf0 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
@@ -141,7 +141,7 @@ public class SynchronizationConfigReader
}
config.setHarvesterTempDir(reader.getString(section, HARVESTER_TEMP_DIR_PROPERTY_NAME, DEFAULT_HARVESTER_TEMP_DIR, false));
- config.setTranslateUsingDataSourceAlias(reader.getBoolean(section, TRANSLATE_USING_DATA_SOURCE_ALIAS_PROPERTY_NAME, false));
+ config.setTranslateUsingDataSourceAlias(reader.getBoolean(section, TRANSLATE_USING_DATA_SOURCE_ALIAS_PROPERTY_NAME, true));
// read full-sync configuration
boolean fullSync = reader.getBoolean(section, FULL_SYNC_PROPERTY_NAME, false);
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
index 100464a0043..9c0d88bbece 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
@@ -85,6 +85,7 @@ import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronize
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor.AttachmentsSynchronizer;
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor.DataSetRegistrationTaskExecutor;
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor.DataSetSynchronizationSummary;
+import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator.DefaultNameTranslator;
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator.INameTranslator;
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator.PrefixBasedNameTranslator;
import ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util.DSPropertyUtils;
@@ -592,7 +593,11 @@ public class EntitySynchronizer
// Parse the resource list: This sends back all projects,
// experiments, samples and data sets contained in the XML together with their last modification date to be used for filtering
operationLog.info("Parsing the resource list xml document...");
- INameTranslator nameTranslator = new PrefixBasedNameTranslator(config.getDataSourceAlias());
+ INameTranslator nameTranslator = new DefaultNameTranslator();
+ if (config.isTranslateUsingDataSourceAlias())
+ {
+ nameTranslator = new PrefixBasedNameTranslator(config.getDataSourceAlias());
+ }
ResourceListParser parser = ResourceListParser.create(nameTranslator, dataStoreCode);
ResourceListParserData data = parser.parseResourceListDocument(doc, monitor);
--
GitLab