diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-10 22:47:14 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-10 22:47:14 (GMT) |
| commit | 6f56474450b7c54f2c95b5dea6a7a42623141649 (patch) | |
| tree | 420c52085d8cf778360c09baf9722b21d01259da /src/uscxml/interpreter | |
| parent | a154682fc1b25581742d38dd5fe9aa06ede167b7 (diff) | |
| download | uscxml-6f56474450b7c54f2c95b5dea6a7a42623141649.zip uscxml-6f56474450b7c54f2c95b5dea6a7a42623141649.tar.gz uscxml-6f56474450b7c54f2c95b5dea6a7a42623141649.tar.bz2 | |
W3C MMI Architecture framework
Diffstat (limited to 'src/uscxml/interpreter')
| -rw-r--r-- | src/uscxml/interpreter/InterpreterDraft6.cpp | 9 | ||||
| -rw-r--r-- | src/uscxml/interpreter/InterpreterDraft7.cpp | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp index 97223f8..fb6a637 100644 --- a/src/uscxml/interpreter/InterpreterDraft6.cpp +++ b/src/uscxml/interpreter/InterpreterDraft6.cpp @@ -14,6 +14,8 @@ void InterpreterDraft6::interpret() { if (!_isInitialized) init(); +// std::cout << _scxml << std::endl; + if (!_scxml) { // _mutex.unlock(); return; @@ -30,8 +32,11 @@ void InterpreterDraft6::interpret() { datamodelName = ATTR(_scxml, "datamodel"); if (datamodelName.length() == 0 && HAS_ATTR(_scxml, "profile")) // SCION SCXML uses profile to specify datamodel datamodelName = ATTR(_scxml, "profile"); - if(datamodelName.length() > 0) - _dataModel = Factory::createDataModel(datamodelName, this); + if(datamodelName.length() > 0) { + _dataModel = _factory->createDataModel(datamodelName, this); + } else { + _dataModel = _factory->createDataModel("null", this); + } if(datamodelName.length() > 0 && !_dataModel) { LOG(ERROR) << "No datamodel for " << datamodelName << " registered"; } diff --git a/src/uscxml/interpreter/InterpreterDraft7.cpp b/src/uscxml/interpreter/InterpreterDraft7.cpp index 2f8c7b2..7f16b1f 100644 --- a/src/uscxml/interpreter/InterpreterDraft7.cpp +++ b/src/uscxml/interpreter/InterpreterDraft7.cpp @@ -38,8 +38,11 @@ void InterpreterDraft7::interpret() { datamodelName = ATTR(_scxml, "datamodel"); if (datamodelName.length() == 0 && HAS_ATTR(_scxml, "profile")) // SCION SCXML uses profile to specify datamodel datamodelName = ATTR(_scxml, "profile"); - if(datamodelName.length() > 0) - _dataModel = Factory::createDataModel(datamodelName, this); + if(datamodelName.length() > 0) { + _dataModel = _factory->createDataModel(datamodelName, this); + } else { + _dataModel = _factory->createDataModel("null", this); + } if(datamodelName.length() > 0 && !_dataModel) { LOG(ERROR) << "No datamodel for " << datamodelName << " registered"; } |