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

update dependency version

parent 05f9d326
No related branches found
No related tags found
No related merge requests found
......@@ -271,7 +271,7 @@ public class TimeseriesAccess implements IArchivingAccess {
// YYYY-MM-DD HH24:MI:SS
final Timestamp timestamp = getTimestamp(argin[1]);
// String returned format: "Timestamp as long"; "read or writevalue"
fr.soleil.tango.archiving.event.select.AttributeValue<?> value = fetcherService.getClosestValue(attributeName, timestamp);
fr.soleil.tango.archiving.event.select.AttributeValue<?> value = fetcherService.getClosestValue(attributeName, timestamp, true);
String result = value.getDataTime().getTime() + ";";
if (value.getValueR() != null) {
result = result + value.getValueR() + ";";
......@@ -332,17 +332,17 @@ public class TimeseriesAccess implements IArchivingAccess {
final double[] timeStamps = new double[data.getAttributeValues().size()];
final String[] values = new String[data.getAttributeValues().size()];
int i = 0;
for (fr.soleil.tango.archiving.event.select.AttributeValue event : data.getAttributeValues()) {
for (fr.soleil.tango.archiving.event.select.AttributeValue<?> event : data.getAttributeValues()) {
timeStamps[i] = event.getDataTime().getTime();
switch (data.getAttributeConfig().getWriteType()) {
case AttrWriteType._READ_WRITE:
values[i] = event.getValueR() + ";" + event.getValueW();
break;
case AttrWriteType._WRITE:
values[i] = event.getValueW() + "";
values[i] = String.valueOf(event.getValueW());
break;
case AttrWriteType._READ:
values[i] = event.getValueR() + "";
values[i] = String.valueOf(event.getValueR());
break;
}
i++;
......@@ -569,7 +569,7 @@ public class TimeseriesAccess implements IArchivingAccess {
final int writeType = dbData.getAttributeConfig().getWriteType();
org.tango.server.attribute.AttributeValue[] readHistory;
final List<AttributeValueBucket> valuesFromDb = dbData.getBuckets();
final List<AttributeValueBucket<?>> valuesFromDb = dbData.getBuckets();
org.tango.server.attribute.AttributeValue[] writeHistory = null;
readHistory = new org.tango.server.attribute.AttributeValue[valuesFromDb.size()];
if (writeType == AttrWriteType._READ) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment