Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add vtype to metadata #19

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Add vtype to metadata #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62e4c78
add vtype to metadata
Oct 30, 2023
11ac82e
Merge branch 'ornl-epics:main' into main
jembishop Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/pvws/ws/Vtype2Json.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ private static void handleNumber(final JsonGenerator g, final VNumber value, fin
if (last_value == null)
{
// Initially, add complete metadata
g.writeStringField("vtype", VType.typeOf(value).getSimpleName());
handleDisplay(g, value.getDisplay());
// Initial severity
g.writeStringField("severity", severity.name());
Expand Down Expand Up @@ -207,6 +208,7 @@ private static void handleDoubles(final JsonGenerator g, final VNumberArray valu
if (last_value == null)
{
// Initially, add complete metadata
g.writeStringField("vtype", VType.typeOf(value).getSimpleName());
handleDisplay(g, value.getDisplay());
// Initial severity
g.writeStringField("severity", severity.name());
Expand Down Expand Up @@ -238,6 +240,7 @@ private static void handleInts(final JsonGenerator g, final VNumberArray value,
if (last_value == null)
{
// Initially, add complete metadata
g.writeStringField("vtype", VType.typeOf(value).getSimpleName());
handleDisplay(g, value.getDisplay());
// Initial severity
g.writeStringField("severity", severity.name());
Expand Down Expand Up @@ -269,6 +272,7 @@ private static void handleEnum(final JsonGenerator g, final VEnum value, final V
if (last_value == null)
{
// Initially, add complete metadata
g.writeStringField("vtype", VType.typeOf(value).getSimpleName());
g.writeArrayFieldStart("labels");
for (final String label : value.getDisplay().getChoices())
g.writeString(label);
Expand Down