# HG changeset patch # User František Kučera # Date 1603658891 -3600 # Node ID 5be268bc4c698b4493b1bc0f39b7a04c9a42eb5d # Parent 530a83382aee962cd3742c61d6767feb55f8996b separate the „std::istream to DOM“ phase diff -r 530a83382aee -r 5be268bc4c69 nbproject/configurations.xml --- a/nbproject/configurations.xml Sat Oct 24 00:08:17 2020 +0200 +++ b/nbproject/configurations.xml Sun Oct 25 21:48:11 2020 +0100 @@ -42,6 +42,7 @@ + XMLDocumentConstructor.h relpipe-in-xmltable.cpp @@ -100,6 +101,8 @@ true + + @@ -139,6 +142,8 @@ true + + diff -r 530a83382aee -r 5be268bc4c69 src/XMLDocumentConstructor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/XMLDocumentConstructor.h Sun Oct 25 21:48:11 2020 +0100 @@ -0,0 +1,41 @@ +/** + * Relational pipes + * Copyright © 2019 František Kučera (Frantovo.cz, GlobalCode.info) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once + +namespace relpipe { +namespace in { +namespace xmltable { + +#include + +class XMLDocumentConstructor { +private: + std::istream* input = nullptr; + xmlpp::DomParser* parser = nullptr; +public: + + XMLDocumentConstructor(std::istream* input, xmlpp::DomParser* parser) : input(input), parser(parser) { + } + + void process() { + parser->parse_stream(*input); + } +}; + +} +} +} \ No newline at end of file diff -r 530a83382aee -r 5be268bc4c69 src/XMLTableCommand.h --- a/src/XMLTableCommand.h Sat Oct 24 00:08:17 2020 +0200 +++ b/src/XMLTableCommand.h Sun Oct 25 21:48:11 2020 +0100 @@ -30,6 +30,7 @@ #include #include "Configuration.h" +#include "XMLDocumentConstructor.h" namespace relpipe { namespace in { @@ -86,7 +87,8 @@ std::shared_ptr writer(Factory::create(output)); xmlpp::DomParser parser; - parser.parse_stream(input); + XMLDocumentConstructor documentConstructor(&input, &parser); + documentConstructor.process(); if (configuration.xinclude) parser.get_document()->process_xinclude(true); xmlpp::Element* root = parser.get_document()->get_root_node();