--- 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 <http://www.gnu.org/licenses/>.
-project (relpipe-tr-grep.cpp)
+project (relpipe-tr-cut.cpp)
cmake_minimum_required(VERSION 2.8)
add_subdirectory (src)
--- 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 @@
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<df root="." name="0">
<df name="src">
- <in>relpipe-tr-grep.cpp</in>
+ <in>relpipe-tr-cut.cpp</in>
</df>
</df>
<logicalFolder name="ExternalFiles"
@@ -76,7 +76,7 @@
<buildCommandWorkingDir>build/Debug</buildCommandWorkingDir>
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
- <executablePath>build/Debug/src/relpipe-tr-grep</executablePath>
+ <executablePath>build/Debug/src/relpipe-tr-cut</executablePath>
<ccTool>
<incDir>
<pElem>../relpipe-lib-reader.cpp/include</pElem>
@@ -92,7 +92,7 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="src/relpipe-tr-grep.cpp" ex="false" tool="1" flavor2="0">
+ <item path="src/relpipe-tr-cut.cpp" ex="false" tool="1" flavor2="0">
<ccTool flags="0">
</ccTool>
</item>
@@ -132,7 +132,7 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="src/relpipe-tr-grep.cpp" ex="false" tool="1" flavor2="0">
+ <item path="src/relpipe-tr-cut.cpp" ex="false" tool="1" flavor2="0">
<ccTool flags="0">
</ccTool>
</item>
--- 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 @@
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>relpipe-tr-grep.cpp</name>
+ <name>relpipe-tr-cut.cpp</name>
<c-extensions/>
<cpp-extensions>cpp</cpp-extensions>
<header-extensions>h</header-extensions>
--- 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 <http://www.gnu.org/licenses/>.
-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:
--- /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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <locale>
+#include <codecvt>
+#include <regex>
+
+#include <relpipe/reader/typedefs.h>
+#include <relpipe/reader/TypeId.h>
+#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
+#include <relpipe/reader/handlers/AttributeMetadata.h>
+
+#include <relpipe/writer/Factory.h>
+
+#include <relpipe/cli/RelpipeCLIException.h>
+
+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<writer::RelationalWriter> relationalWriter;
+
+ wregex relationNameRegEx;
+ wregex attributeNameRegEx;
+ wregex searchRegEx;
+
+ vector<boolean_t> currentSearchableAttributes;
+ vector<string_t> currentRecord;
+ integer_t currentAttributeIndex = 0;
+ boolean_t includeCurrentRecord = false;
+ boolean_t filterCurrentRelation = false;
+
+public:
+
+ GrepHandler(ostream& output, const vector<string_t>& 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 <relationNameRegExp> <attributeNameRegExp> <searchRegExp>", cli::CLI::EXIT_CODE_UNKNOWN_COMMAND);
+ }
+ }
+
+ void startRelation(string_t name, vector<AttributeMetadata> attributes) override {
+ // TODO: move to a reusable method (or use same metadata on both reader and writer side?)
+ vector<writer::AttributeMetadata> 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() {
+
+ }
+
+};
+
+}
+}
+}
--- 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 <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-#include <iostream>
-#include <sstream>
-#include <locale>
-#include <codecvt>
-#include <regex>
-
-#include <relpipe/reader/typedefs.h>
-#include <relpipe/reader/TypeId.h>
-#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
-#include <relpipe/reader/handlers/AttributeMetadata.h>
-
-#include <relpipe/writer/Factory.h>
-
-#include <relpipe/cli/RelpipeCLIException.h>
-
-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<writer::RelationalWriter> relationalWriter;
-
- wregex relationNameRegEx;
- wregex attributeNameRegEx;
- wregex searchRegEx;
-
- vector<boolean_t> currentSearchableAttributes;
- vector<string_t> currentRecord;
- integer_t currentAttributeIndex = 0;
- boolean_t includeCurrentRecord = false;
- boolean_t filterCurrentRelation = false;
-
-public:
-
- GrepHandler(ostream& output, const vector<string_t>& 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 <relationNameRegExp> <attributeNameRegExp> <searchRegExp>", cli::CLI::EXIT_CODE_UNKNOWN_COMMAND);
- }
- }
-
- void startRelation(string_t name, vector<AttributeMetadata> attributes) override {
- // TODO: move to a reusable method (or use same metadata on both reader and writer side?)
- vector<writer::AttributeMetadata> 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() {
-
- }
-
-};
-
-}
-}
-}
--- /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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <cstdio>
+#include <cstdlib>
+#include <memory>
+
+#include <relpipe/cli/CLI.h>
+#include <relpipe/cli/RelpipeCLIException.h>
+
+#include <relpipe/reader/Factory.h>
+#include <relpipe/reader/RelationalReader.h>
+#include <relpipe/reader/RelpipeReaderException.h>
+
+#include <relpipe/writer/RelationalWriter.h>
+#include <relpipe/writer/RelpipeWriterException.h>
+#include <relpipe/writer/Factory.h>
+#include <relpipe/writer/TypeId.h>
+
+#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<RelationalReader> 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;
+}
--- 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 <http://www.gnu.org/licenses/>.
- */
-
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-
-#include <relpipe/cli/CLI.h>
-#include <relpipe/cli/RelpipeCLIException.h>
-
-#include <relpipe/reader/Factory.h>
-#include <relpipe/reader/RelationalReader.h>
-#include <relpipe/reader/RelpipeReaderException.h>
-
-#include <relpipe/writer/RelationalWriter.h>
-#include <relpipe/writer/RelpipeWriterException.h>
-#include <relpipe/writer/Factory.h>
-#include <relpipe/writer/TypeId.h>
-
-#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<RelationalReader> 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;
-}