Skip to content

Support manual tag ordering within inner repeating groups #41

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
mobiletradingpartners wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support manual tag ordering within inner repeating groups #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136b373
Adding support for manual tags order for inner repeating group
kovalchuck Apr 3, 2017
b3ed91c
Merge pull request #1 from bkovalchuk/master
mobiletradingpartners Apr 3, 2017
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
31 changes: 28 additions & 3 deletions src/FixMessageUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@ class FixMessageUtil {

} else {

FIX::Group* group = new FIX::Group(
groupObj->Get(indexKey)->ToInteger()->Value(),
groupObj->Get(delimKey)->ToInteger()->Value());
FIX::Group* group = getGroup(groupObj);

// compat for old, non-nested format

Expand All @@ -147,6 +145,33 @@ class FixMessageUtil {
}
}

static std::vector<int> getTagOrder(Local<v8::Array> tagsOrder){
std::vector<int> values;
int numValues = tagsOrder->Length();
for (int i = 0; i < numValues; i++) {
values.push_back(tagsOrder->Get(i)->NumberValue());
}
values.push_back(0);
return values;
}

static FIX::Group* getGroup(Local<v8::Object> groupObj){
Local<v8::String> delimKey = Nan::New<v8::String>("delim").ToLocalChecked();
Local<v8::String> orderKey = Nan::New<v8::String>("order").ToLocalChecked();
Local<v8::String> indexKey = Nan::New<v8::String>("index").ToLocalChecked();
if( ! groupObj->Has(orderKey)){
return new FIX::Group(
groupObj->Get(indexKey)->ToInteger()->Value(),
groupObj->Get(delimKey)->ToInteger()->Value());
} else {
Local<v8::Array> tagsOrder = Local<v8::Array>::Cast(groupObj->Get(orderKey));
return new FIX::Group(
groupObj->Get(indexKey)->ToInteger()->Value(),
groupObj->Get(delimKey)->ToInteger()->Value(),
&getTagOrder(tagsOrder)[0]); //correct
}
}

static void addFixTrailer(FIX::Message* message, Local<v8::Object> msg) {

FIX::Trailer &msgTrailer = message->getTrailer();
Expand Down