Skip to content
Snippets Groups Projects
Commit 4ab8987c authored by gwen-soleil's avatar gwen-soleil
Browse files

adapt to change of TTS API

parent 9a78569d
Branches
No related tags found
No related merge requests found
...@@ -38,14 +38,13 @@ import fr.esrf.TangoApi.AttributeInfoEx; ...@@ -38,14 +38,13 @@ import fr.esrf.TangoApi.AttributeInfoEx;
import fr.soleil.tango.archiving.config.AttributeConfig; import fr.soleil.tango.archiving.config.AttributeConfig;
import fr.soleil.tango.archiving.config.AttributeParameters; import fr.soleil.tango.archiving.config.AttributeParameters;
import fr.soleil.tango.archiving.exception.TangoTimeseriesException; import fr.soleil.tango.archiving.exception.TangoTimeseriesException;
import fr.soleil.tango.archiving.infra.tango.ITangoAttributeFetcher;
import fr.soleil.tango.clientapi.TangoAttribute; import fr.soleil.tango.clientapi.TangoAttribute;
import org.tango.utils.TangoUtil; import org.tango.utils.TangoUtil;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.Instant; import java.time.Instant;
public class TangoAttributeConfigFetcher implements ITangoAttributeFetcher { public class TangoAttributeConfigFetcher {
private final AttributeConfig config = new AttributeConfig(); private final AttributeConfig config = new AttributeConfig();
private final AttributeParameters parameters = new AttributeParameters(); private final AttributeParameters parameters = new AttributeParameters();
...@@ -82,12 +81,12 @@ public class TangoAttributeConfigFetcher implements ITangoAttributeFetcher { ...@@ -82,12 +81,12 @@ public class TangoAttributeConfigFetcher implements ITangoAttributeFetcher {
} }
} }
@Override
public AttributeConfig getConfig() { public AttributeConfig getConfig() {
return config; return config;
} }
@Override
public AttributeParameters getParameters() { public AttributeParameters getParameters() {
return parameters; return parameters;
} }
......
...@@ -18,6 +18,7 @@ import org.tango.archiving.collector.data.AttributeScalarEvent; ...@@ -18,6 +18,7 @@ import org.tango.archiving.collector.data.AttributeScalarEvent;
import org.tango.archiving.collector.data.ImageEventRO; import org.tango.archiving.collector.data.ImageEventRO;
import org.tango.archiving.collector.data.SpectrumEventRO; import org.tango.archiving.collector.data.SpectrumEventRO;
import org.tango.archiving.collector.data.SpectrumEventRW; import org.tango.archiving.collector.data.SpectrumEventRW;
import org.tango.archiving.collector.data.TangoAttributeConfigCache;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -46,7 +47,9 @@ public class ArchivingTimeSeries implements IArchivingDatabase { ...@@ -46,7 +47,9 @@ public class ArchivingTimeSeries implements IArchivingDatabase {
@Override @Override
public void registerAttributeMode(final ArchivingConfig config) { public void registerAttributeMode(final ArchivingConfig config) {
timeScale.registerAttribute(config.getAttributeConfig().getFullName(), String attribute = config.getAttributeConfig().getFullName();
timeScale.registerAttribute(config.getAttributeConfig(),
TangoAttributeConfigCache.getAttributeFetcher(attribute).getParameters(),
config.getModes(), config.getArchiver(), 0); config.getModes(), config.getArchiver(), 0);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment