Skip to content

Added json5 option to -M option for PVA tools #201

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added json5 option to -M option for PVA tools #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions pvtoolsSrc/pvget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ int MAIN (int argc, char *argv[])
outmode = pvd::PVStructure::Formatter::NT;
} else if(strcmp(optarg, "json")==0) {
outmode = pvd::PVStructure::Formatter::JSON;
} else if(strcmp(optarg, "json5")==0) {
outmode = pvd::PVStructure::Formatter::JSON5;
} else {
fprintf(stderr, "Unknown output mode '%s'\n", optarg);
outmode = pvd::PVStructure::Formatter::Raw;
Expand Down
14 changes: 7 additions & 7 deletions pvtoolsSrc/pvutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ namespace pva = epics::pvAccess;
"options:\n" \
" -h: Help: Print this message\n" \
" -V: Print version and exit\n" \
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n" \
" -w <sec>: Wait time, specifies timeout, default is %f second(s)\n" \
" -p <provider>: Set default provider name, default is '%s'\n" \
" -M <raw|nt|json>: Output mode. default is 'nt'\n" \
" -v: Show entire structure (implies Raw mode)\n" \
" -q: Quiet mode, print only error messages\n" \
" -d: Enable debug output\n"
" -r <pv request>: Request, specifies what fields to return and options, default is '%s'\n" \
" -w <sec>: Wait time, specifies timeout, default is %f second(s)\n" \
" -p <provider>: Set default provider name, default is '%s'\n" \
" -M <raw|nt|json|json5>: Output mode. default is 'nt'\n" \
" -v: Show entire structure (implies Raw mode)\n" \
" -q: Quiet mode, print only error messages\n" \
" -d: Enable debug output\n"

extern double timeout;
extern bool debugFlag;
Expand Down