# HG changeset patch # User František Kučera # Date 1544654746 -3600 # Node ID f06781a5071b59570836876299d681b77042178a # Parent f66c759d1111e7f26af6c0c7191396920cf5ffb3 project skeleton diff -r f66c759d1111 -r f06781a5071b CMakeLists.txt --- a/CMakeLists.txt Mon Dec 10 21:17:26 2018 +0100 +++ b/CMakeLists.txt Wed Dec 12 23:45:46 2018 +0100 @@ -14,6 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -project (relpipe-tr-grep.cpp) +project (relpipe-tr-cut.cpp) cmake_minimum_required(VERSION 2.8) add_subdirectory (src) diff -r f66c759d1111 -r f06781a5071b nbproject/configurations.xml --- a/nbproject/configurations.xml Mon Dec 10 21:17:26 2018 +0100 +++ b/nbproject/configurations.xml Wed Dec 12 23:45:46 2018 +0100 @@ -42,7 +42,7 @@ - relpipe-tr-grep.cpp + relpipe-tr-cut.cpp build/Debug ${MAKE} -f Makefile ${MAKE} -f Makefile clean - build/Debug/src/relpipe-tr-grep + build/Debug/src/relpipe-tr-cut ../relpipe-lib-reader.cpp/include @@ -92,7 +92,7 @@ true - + @@ -132,7 +132,7 @@ true - + diff -r f66c759d1111 -r f06781a5071b nbproject/project.xml --- a/nbproject/project.xml Mon Dec 10 21:17:26 2018 +0100 +++ b/nbproject/project.xml Wed Dec 12 23:45:46 2018 +0100 @@ -42,7 +42,7 @@ org.netbeans.modules.cnd.makeproject - relpipe-tr-grep.cpp + relpipe-tr-cut.cpp cpp h diff -r f66c759d1111 -r f06781a5071b src/CMakeLists.txt --- a/src/CMakeLists.txt Mon Dec 10 21:17:26 2018 +0100 +++ b/src/CMakeLists.txt Wed Dec 12 23:45:46 2018 +0100 @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(EXECUTABLE_FILE "relpipe-tr-grep") +set(EXECUTABLE_FILE "relpipe-tr-cut") # Relpipe libraries: INCLUDE(FindPkgConfig) @@ -30,7 +30,7 @@ # Executable output: add_executable( ${EXECUTABLE_FILE} - relpipe-tr-grep.cpp + relpipe-tr-cut.cpp ) # Link libraries: diff -r f66c759d1111 -r f06781a5071b src/CutHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/CutHandler.h Wed Dec 12 23:45:46 2018 +0100 @@ -0,0 +1,124 @@ +/** + * 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 + +#include + +namespace relpipe { +namespace tr { +namespace grep { + +using namespace std; +using namespace relpipe; +using namespace relpipe::reader; +using namespace relpipe::reader::handlers; + +class GrepHandler : public RelationalReaderStringHadler { +private: + shared_ptr relationalWriter; + + wregex relationNameRegEx; + wregex attributeNameRegEx; + wregex searchRegEx; + + vector currentSearchableAttributes; + vector currentRecord; + integer_t currentAttributeIndex = 0; + boolean_t includeCurrentRecord = false; + boolean_t filterCurrentRelation = false; + +public: + + GrepHandler(ostream& output, const vector& arguments) { + relationalWriter.reset(writer::Factory::create(output)); + + if (arguments.size() == 3) { + relationNameRegEx = wregex(arguments[0]); + attributeNameRegEx = wregex(arguments[1]); + searchRegEx = wregex(arguments[2]); + } else { + throw cli::RelpipeCLIException(L"Usage: relpipe-tr-cut ", cli::CLI::EXIT_CODE_UNKNOWN_COMMAND); + } + } + + void startRelation(string_t name, vector attributes) override { + // TODO: move to a reusable method (or use same metadata on both reader and writer side?) + vector writerMetadata; + for (AttributeMetadata readerMetadata : attributes) { + writerMetadata.push_back({readerMetadata.getAttributeName(), relationalWriter->toTypeId(readerMetadata.getTypeName())}); + } + + + currentRecord.resize(attributes.size()); + currentSearchableAttributes.resize(attributes.size(), false); + filterCurrentRelation = regex_match(name, relationNameRegEx); + if (filterCurrentRelation) { + for (int i = 0; i < currentSearchableAttributes.size(); i++) { + currentSearchableAttributes[i] = regex_match(attributes[i].getAttributeName(), attributeNameRegEx); + } + } + + relationalWriter->startRelation(name, writerMetadata, true); + } + + void attribute(const string_t& value) override { + if (filterCurrentRelation) { + currentRecord[currentAttributeIndex] = value; + + if (currentSearchableAttributes[currentAttributeIndex]) { + includeCurrentRecord |= regex_search(value, searchRegEx); + } + + currentAttributeIndex++; + + if (currentAttributeIndex > 0 && currentAttributeIndex % currentSearchableAttributes.size() == 0) { + if (includeCurrentRecord) for (string_t v : currentRecord) relationalWriter->writeAttribute(v); + includeCurrentRecord = false; + } + + currentAttributeIndex = currentAttributeIndex % currentSearchableAttributes.size(); + } else { + relationalWriter->writeAttribute(value); + } + } + + void endOfPipe() { + + } + +}; + +} +} +} diff -r f66c759d1111 -r f06781a5071b src/GrepHandler.h --- a/src/GrepHandler.h Mon Dec 10 21:17:26 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/** - * 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 - -#include - -namespace relpipe { -namespace tr { -namespace grep { - -using namespace std; -using namespace relpipe; -using namespace relpipe::reader; -using namespace relpipe::reader::handlers; - -class GrepHandler : public RelationalReaderStringHadler { -private: - shared_ptr relationalWriter; - - wregex relationNameRegEx; - wregex attributeNameRegEx; - wregex searchRegEx; - - vector currentSearchableAttributes; - vector currentRecord; - integer_t currentAttributeIndex = 0; - boolean_t includeCurrentRecord = false; - boolean_t filterCurrentRelation = false; - -public: - - GrepHandler(ostream& output, const vector& arguments) { - relationalWriter.reset(writer::Factory::create(output)); - - if (arguments.size() == 3) { - relationNameRegEx = wregex(arguments[0]); - attributeNameRegEx = wregex(arguments[1]); - searchRegEx = wregex(arguments[2]); - } else { - throw cli::RelpipeCLIException(L"Usage: relpipe-tr-grep ", cli::CLI::EXIT_CODE_UNKNOWN_COMMAND); - } - } - - void startRelation(string_t name, vector attributes) override { - // TODO: move to a reusable method (or use same metadata on both reader and writer side?) - vector writerMetadata; - for (AttributeMetadata readerMetadata : attributes) { - writerMetadata.push_back({readerMetadata.getAttributeName(), relationalWriter->toTypeId(readerMetadata.getTypeName())}); - } - - - currentRecord.resize(attributes.size()); - currentSearchableAttributes.resize(attributes.size(), false); - filterCurrentRelation = regex_match(name, relationNameRegEx); - if (filterCurrentRelation) { - for (int i = 0; i < currentSearchableAttributes.size(); i++) { - currentSearchableAttributes[i] = regex_match(attributes[i].getAttributeName(), attributeNameRegEx); - } - } - - relationalWriter->startRelation(name, writerMetadata, true); - } - - void attribute(const string_t& value) override { - if (filterCurrentRelation) { - currentRecord[currentAttributeIndex] = value; - - if (currentSearchableAttributes[currentAttributeIndex]) { - includeCurrentRecord |= regex_search(value, searchRegEx); - } - - currentAttributeIndex++; - - if (currentAttributeIndex > 0 && currentAttributeIndex % currentSearchableAttributes.size() == 0) { - if (includeCurrentRecord) for (string_t v : currentRecord) relationalWriter->writeAttribute(v); - includeCurrentRecord = false; - } - - currentAttributeIndex = currentAttributeIndex % currentSearchableAttributes.size(); - } else { - relationalWriter->writeAttribute(value); - } - } - - void endOfPipe() { - - } - -}; - -} -} -} diff -r f66c759d1111 -r f06781a5071b src/relpipe-tr-cut.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/relpipe-tr-cut.cpp Wed Dec 12 23:45:46 2018 +0100 @@ -0,0 +1,67 @@ +/** + * 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 . + */ + +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include "CutHandler.h" + +using namespace relpipe::cli; +using namespace relpipe::reader; +using namespace relpipe::tr::grep; + +int main(int argc, char**argv) { + setlocale(LC_ALL, ""); + CLI::untieStdIO(); + CLI cli(argc, argv); + + int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR; + + try { + std::shared_ptr reader(Factory::create(std::cin)); + GrepHandler handler(std::cout, cli.arguments()); + reader->addHandler(&handler); + reader->process(); + + resultCode = CLI::EXIT_CODE_SUCCESS; + + } catch (RelpipeCLIException& e) { + fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str()); + fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount()); + resultCode = e.getExitCode(); + } catch (RelpipeReaderException& e) { + fwprintf(stderr, L"Caught Reader exception: %ls\n", e.getMessge().c_str()); + fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount()); + resultCode = CLI::EXIT_CODE_DATA_ERROR; + } + + return resultCode; +} diff -r f66c759d1111 -r f06781a5071b src/relpipe-tr-grep.cpp --- a/src/relpipe-tr-grep.cpp Mon Dec 10 21:17:26 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/** - * 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 . - */ - -#include -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include "GrepHandler.h" - -using namespace relpipe::cli; -using namespace relpipe::reader; -using namespace relpipe::tr::grep; - -int main(int argc, char**argv) { - setlocale(LC_ALL, ""); - CLI::untieStdIO(); - CLI cli(argc, argv); - - int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR; - - try { - std::shared_ptr reader(Factory::create(std::cin)); - GrepHandler handler(std::cout, cli.arguments()); - reader->addHandler(&handler); - reader->process(); - - resultCode = CLI::EXIT_CODE_SUCCESS; - - } catch (RelpipeCLIException& e) { - fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str()); - fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount()); - resultCode = e.getExitCode(); - } catch (RelpipeReaderException& e) { - fwprintf(stderr, L"Caught Reader exception: %ls\n", e.getMessge().c_str()); - fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount()); - resultCode = CLI::EXIT_CODE_DATA_ERROR; - } - - return resultCode; -}