--- a/src/CMakeLists.txt Mon Dec 10 00:06:54 2018 +0100
+++ b/src/CMakeLists.txt Mon Dec 10 17:28:53 2018 +0100
@@ -30,7 +30,6 @@
# Executable output:
add_executable(
${EXECUTABLE_FILE}
- PassthroughHandler.h
relpipe-tr-sed.cpp
)
--- a/src/PassthroughHandler.h Mon Dec 10 00:06:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +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>
-
-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<AttributeMetadata> attributes) override {
- // TODO: move to a reusable method (or use same metadata on both reader and writer side?)
- std::vector<writer::AttributeMetadata> 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() {
-
- }
-
-};
-
-}
-}
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/SedHandler.h Mon Dec 10 17:28:53 2018 +0100
@@ -0,0 +1,111 @@
+/**
+ * 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 sed {
+
+using namespace std;
+using namespace relpipe;
+using namespace relpipe::reader;
+using namespace relpipe::reader::handlers;
+
+class SedHandler : public RelationalReaderStringHadler {
+private:
+ shared_ptr<writer::RelationalWriter> relationalWriter;
+
+ wregex relationNameRegEx;
+ wregex attributeNameRegEx;
+ wregex searchRegEx;
+ wregex replacementRegEx;
+
+ vector<boolean_t> currentReplacableAttributes;
+ integer_t currentAttributeIndex = 0;
+
+public:
+
+ SedHandler(ostream& output, const vector<string_t>& arguments) {
+ relationalWriter.reset(writer::Factory::create(output));
+
+ if (arguments.size() == 4) {
+ relationNameRegEx = wregex(arguments[0]);
+ attributeNameRegEx = wregex(arguments[1]);
+ searchRegEx = wregex(arguments[2]);
+ replacementRegEx = wregex(arguments[3]);
+ } else {
+ throw cli::RelpipeCLIException(L"Usage: relpipe-tr-sed <relationNameRegExp> <attributeNameRegExp> <searchRegExp> <replacementRegExp>", 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())});
+ }
+
+
+ currentReplacableAttributes.resize(attributes.size(), false);
+ if (regex_match(name, relationNameRegEx)) {
+ for (int i = 0; i < currentReplacableAttributes.size(); i++) {
+ currentReplacableAttributes[i] = regex_match(attributes[i].getAttributeName(), attributeNameRegEx);
+ }
+ }
+
+ relationalWriter->startRelation(name, writerMetadata, true);
+ }
+
+ void attribute(const string_t& value) override {
+ if (currentReplacableAttributes[currentAttributeIndex]) {
+ relationalWriter->writeAttribute(L"1234");
+ } else {
+ relationalWriter->writeAttribute(value);
+ }
+
+ currentAttributeIndex++;
+ currentAttributeIndex = currentAttributeIndex % currentReplacableAttributes.size();
+ }
+
+ void endOfPipe() {
+
+ }
+
+};
+
+}
+}
+}
--- a/src/relpipe-tr-sed.cpp Mon Dec 10 00:06:54 2018 +0100
+++ b/src/relpipe-tr-sed.cpp Mon Dec 10 17:28:53 2018 +0100
@@ -32,32 +32,32 @@
#include <relpipe/writer/Factory.h>
#include <relpipe/writer/TypeId.h>
-#include "PassthroughHandler.h"
+#include "SedHandler.h"
using namespace relpipe::cli;
using namespace relpipe::reader;
-using namespace relpipe::tr::validator;
+using namespace relpipe::tr::sed;
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));
- PassthroughHandler handler(std::cout);
+ SedHandler handler(std::cout, cli.arguments());
reader->addHandler(&handler);
reader->process();
resultCode = CLI::EXIT_CODE_SUCCESS;
- } catch (RelpipeCLIException e) {
+ } 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) {
+ } 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;