Skip to content
Snippets Groups Projects
Commit b8fbbd9b authored by Katy Saintin's avatar Katy Saintin
Browse files

Update EPICS Appliance plugin's name and informations

parent 70ec9a04
Branches
Tags
No related merge requests found
......@@ -17,7 +17,7 @@
<!-- MOONArch library -->
<dependency>
<groupId>heps.epics</groupId>
<artifactId>moon-archiving-appliance</artifactId>
<artifactId>moonarch-appliance</artifactId>
<version>0.0.1</version>
</dependency>
......
......@@ -267,6 +267,15 @@ public class MoonArchKey extends IrfuKey {
fileKey.registerProperty("First event date", pvData.getFirstEventDate());
fileKey.registerProperty("Last event date", pvData.getLastEventDate());
fileKey.registerProperty("Approximated events count", pvData.getNumberOfEvents() / 2);
try {
heps.epics.moonarch.interfaces.DataType dataType = pvData.getDataType();
if(dataType != null) {
fileKey.registerProperty("Archiving data type", dataType.toString());
}
}
catch(Exception e){
}
}
MoonArchKey moonArchKey = new MoonArchKey();
copySamplingParameter(fileKey, moonArchKey);
......
......@@ -108,7 +108,7 @@ public class EpicsDataSourceSeeker extends AbstractFileDataSourceSeeker {
IPlcIoc iocItem = PlcParserApi.loadIocFromEpicsDbFile(parentDirectory, selectedFile.getName(), false,
null);
Map<String, IRecord> recordMap = iocItem.getRecordMap();
Map<String, ISimpleRecord> recordMap = iocItem.getRecordMap();
EpicsKey.createPvListForEpicsFile(createDeviceKey, recordMap);
} catch (Exception e) {
......
......@@ -45,7 +45,7 @@ public class MoonarchDataSourceBrowser extends AbstractDataSourceProducerBrowser
@Override
public String getName() {
return "IRFU's MOONARCH plugin";
return "IRFU's EPICS Appliance plugin";
}
@Override
......@@ -208,7 +208,7 @@ public class MoonarchDataSourceBrowser extends AbstractDataSourceProducerBrowser
Object propertyValue = null;
for (String string : existingKeys) {
propertyValue = key.getPropertyValue(string);
if (propertyValue instanceof String || propertyValue instanceof Number || propertyValue instanceof Date) {
if (propertyValue instanceof String || propertyValue instanceof Number || propertyValue instanceof Date || propertyValue instanceof Boolean) {
informations.put(PV_INFO + string, key.getPropertyValue(string).toString());
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment