Important update:

- DataTree->GetStr return Member->Value or NULL if not found
- Rename DeviceCore EDataType to EMBDataType, avoid conflict with JSONpaser
- Add DataTree to FunctionCore with LoadConfig() method
- Change ProcessName to char * (from char[])
- JSONparse:
  - Rename RootPath to BasePath on all methods to reduce confusion
  - Allow FilePath to be NULL, add '/' if not present
  - Fixed Parsing sequence in ParseObject & ParseArray
This commit is contained in:
Charl Wentzel
2017-04-10 21:33:14 +02:00
parent 9b42d516a1
commit ee29625b9a
8 changed files with 89 additions and 66 deletions

View File

@@ -534,10 +534,10 @@ const char * CDataTree::GetStr( TDataMember * BaseMember, const char * Path, con
}
else if (Member && Create && (Member->Type == jtNull)) {
SetValue( Member, jtString, Default );
return Default;
return Member->Value;
}
else {
return Default;
return NULL;
}
}
//---------------------------------------------------------------------------
@@ -554,11 +554,11 @@ const char * CDataTree::GetStr( TDataMember * BaseMember, const char * Path, int
else if (Member && Create && (Member->Type == jtNull)) {
SetValue( Member, jtString, Default );
Len = Member->Len;
return Default;
return Member->Value;
}
else {
Len = strlen( Default );
return Default;
Len = 0;
return NULL;
}
}
//---------------------------------------------------------------------------