# HG changeset patch # User František Kučera # Date 1543778266 -3600 # Node ID 8731263d44f1ad77da217bfd3cadb430a598b709 # Parent eb2066405f795a9f70951123fb1c4ec099397fe3 PassthroughHandler (string-based version) Produces exact same data -- tested with: relpipe-in-fstab | relpipe-tr-validator | sha512sum relpipe-in-fstab | sha512sum diff -r eb2066405f79 -r 8731263d44f1 nbproject/project.xml --- a/nbproject/project.xml Sun Dec 02 18:25:43 2018 +0100 +++ b/nbproject/project.xml Sun Dec 02 20:17:46 2018 +0100 @@ -45,7 +45,7 @@ relpipe-tr-validator.cpp cpp - + h UTF-8 . diff -r eb2066405f79 -r 8731263d44f1 src/CMakeLists.txt --- a/src/CMakeLists.txt Sun Dec 02 18:25:43 2018 +0100 +++ b/src/CMakeLists.txt Sun Dec 02 20:17:46 2018 +0100 @@ -30,6 +30,7 @@ # Executable output: add_executable( ${EXECUTABLE_FILE} + PassthroughHandler.h relpipe-tr-validator.cpp ) diff -r eb2066405f79 -r 8731263d44f1 src/PassthroughHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/PassthroughHandler.h Sun Dec 02 20:17:46 2018 +0100 @@ -0,0 +1,79 @@ +/** + * Relational pipes + * Copyright © 2018 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, either version 3 of the License, or + * (at your option) any later version. + * + * 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 + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +namespace relpipe { +namespace tr { +namespace validator { + +using namespace relpipe; +using namespace relpipe::reader; +using namespace relpipe::reader::handlers; + +// TODO: use rather RelationalReaderStringHadler +class PassthroughHandler : public RelationalReaderStringHadler { +private: + writer::RelationalWriter* relationalWriter; +public: + + PassthroughHandler(std::ostream& output) : relationalWriter(writer::Factory::create(output)) { + } + + virtual ~PassthroughHandler() { + delete relationalWriter; + } + + void startRelation(string_t name, std::vector attributes) override { + // TODO: move to a reusable method (or use same metadata on both reader and writer side?) + std::vector writerMetadata; + for (AttributeMetadata readerMetadata : attributes) { + writerMetadata.push_back({readerMetadata.getAttributeName(), relationalWriter->toTypeId(readerMetadata.getTypeName())}); + } + + relationalWriter->startRelation(name, writerMetadata, true); + } + + void attribute(const string_t& value) override { + relationalWriter->writeAttribute(value); + } + + void endOfPipe() { + + } + +}; + +} +} +} diff -r eb2066405f79 -r 8731263d44f1 src/relpipe-tr-validator.cpp --- a/src/relpipe-tr-validator.cpp Sun Dec 02 18:25:43 2018 +0100 +++ b/src/relpipe-tr-validator.cpp Sun Dec 02 20:17:46 2018 +0100 @@ -31,8 +31,11 @@ #include #include +#include "PassthroughHandler.h" + using namespace relpipe::cli; using namespace relpipe::reader; +using namespace relpipe::tr::validator; int main(int argc, char**argv) { CLI cli(argc, argv); @@ -41,8 +44,8 @@ try { std::shared_ptr reader(Factory::create(std::cin)); - //TabularPrefetchingHandler handler(std::cout); - //reader->addHandler(&handler); + PassthroughHandler handler(std::cout); + reader->addHandler(&handler); reader->process(); resultCode = CLI::EXIT_CODE_SUCCESS;