equal
deleted
inserted
replaced
27 #include <relpipe/cli/CLI.h> |
27 #include <relpipe/cli/CLI.h> |
28 |
28 |
29 #include "INICommand.h" |
29 #include "INICommand.h" |
30 #include "lib/INIReader.h" |
30 #include "lib/INIReader.h" |
31 #include "lib/BasicUnescapingINIHandler.h" |
31 #include "lib/BasicUnescapingINIHandler.h" |
|
32 #include "lib/JavaPropertiesUnescapingINIHandler.h" |
32 |
33 |
33 using namespace std; |
34 using namespace std; |
34 using namespace relpipe::writer; |
35 using namespace relpipe::writer; |
35 using namespace relpipe::in::ini::lib; |
36 using namespace relpipe::in::ini::lib; |
36 |
37 |
168 |
169 |
169 void INICommand::process(std::istream& input, std::shared_ptr<writer::RelationalWriter> writer, Configuration& configuration) { |
170 void INICommand::process(std::istream& input, std::shared_ptr<writer::RelationalWriter> writer, Configuration& configuration) { |
170 FlatINIContentHandler handler(writer, configuration); |
171 FlatINIContentHandler handler(writer, configuration); |
171 std::shared_ptr<INIReader> reader(INIReader::create(input)); |
172 std::shared_ptr<INIReader> reader(INIReader::create(input)); |
172 // TODO: configure the INIReader (features/properties) according to our Configuration (sub-keys etc.) |
173 // TODO: configure the INIReader (features/properties) according to our Configuration (sub-keys etc.) |
173 BasicUnescapingINIContentHandler unescapingHandler(handler, true); |
174 BasicUnescapingINIContentHandler unescapingHandler(handler, false); |
174 reader->addHandler(&unescapingHandler); |
175 JavaPropertiesUnescapingINIContentHandler javaHandler(unescapingHandler, true); |
|
176 reader->addHandler(&javaHandler); |
175 reader->process(); |
177 reader->process(); |
176 |
178 |
177 } |
179 } |
178 |
180 |
179 } |
181 } |