epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Make CreateRequest compatible with the Java version

Browse Source
This commit is contained in:
Marty Kraimer
2012-06-26 09:33:37 -04:00
parent 4b5bc38835
commit 7e8312d1ee
10 changed files with 465 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
testApp/remote/eget.cpp
View File

@@ -20,6 +20,21 @@ using namespace std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
class RequesterImpl : public Requester,
public std::tr1::enable_shared_from_this<RequesterImpl>
{
public:
virtual String getRequesterName()
{
return "RequesterImpl";
};
virtual void message(String message,MessageType messageType)
{
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
};
/// terse mode functions
@@ -773,6 +788,8 @@ int main (int argc, char *argv[])
int opt; /* getopt() current option */
bool debug = false;
bool cleanupAndReport = false;
Requester::shared_pointer requester(new RequesterImpl());
bool serviceRequest = false;
string service;
@@ -869,10 +886,9 @@ int main (int argc, char *argv[])
pvs.push_back(argv[optind]); /* Copy PV names from command line */
PVStructure::shared_pointer pvRequest;
try {
pvRequest = getCreateRequest()->createRequest(request);
} catch (std::exception &ex) {
printf("failed to parse request string: %s\n", ex.what());
pvRequest = getCreateRequest()->createRequest(request,requester);
if(pvRequest.get()==NULL) {
printf("failed to parse request string\n");
return 1;
}
@@ -927,10 +943,9 @@ int main (int argc, char *argv[])
// TODO simply empty?
PVStructure::shared_pointer pvRequest;
try {
pvRequest = getCreateRequest()->createRequest(request);
} catch (std::exception &ex) {
printf("failed to parse request string: %s\n", ex.what());
pvRequest = getCreateRequest()->createRequest(request,requester);
if(pvRequest.get()==NULL) {
printf("failed to parse request string\n");
return 1;
}