diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
| commit | 836927aa902696297febc95132e2c82147c08c03 (patch) | |
| tree | 64bcbaa67c6f70acdb5f4cc9184f600fad46b826 /src/uscxml/Factory.cpp | |
| parent | f7ca1ebaa5a527f817892bc3794452df1a6c20c6 (diff) | |
| download | uscxml-836927aa902696297febc95132e2c82147c08c03.zip uscxml-836927aa902696297febc95132e2c82147c08c03.tar.gz uscxml-836927aa902696297febc95132e2c82147c08c03.tar.bz2 | |
Expect Invoker and Fedora build fixes
Diffstat (limited to 'src/uscxml/Factory.cpp')
| -rw-r--r-- | src/uscxml/Factory.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp index 7677fd4..c32c6a8 100644 --- a/src/uscxml/Factory.cpp +++ b/src/uscxml/Factory.cpp @@ -72,6 +72,10 @@ # include "uscxml/plugins/invoker/im/IMInvoker.h" # endif +# if (defined EXPECT_FOUND && defined TCL_FOUND) +# include "uscxml/plugins/invoker/expect/ExpectInvoker.h" +# endif + #ifdef OPENAL_FOUND # include "uscxml/plugins/invoker/audio/OpenALInvoker.h" #endif @@ -202,6 +206,13 @@ Factory::Factory() { } #endif +#if (defined EXPECT_FOUND && defined TCL_FOUND) + { + ExpectInvoker* invoker = new ExpectInvoker(); + registerInvoker(invoker); + } +#endif + #if (defined OPENAL_FOUND && (defined LIBSNDFILE_FOUND || defined AUDIOTOOLBOX_FOUND)) { OpenALInvoker* invoker = new OpenALInvoker(); @@ -510,7 +521,11 @@ size_t DataModelImpl::replaceExpressions(std::string& content) { // } else { // ss << data.atom; // } - ss << Data::toJSON(data); + if (data.atom.length() > 0) { + ss << data.atom; + } else { + ss << Data::toJSON(data); + } replacements++; } catch (Event e) { // insert unsubstituted |