summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2008-10-29 10:02:00 +0000
committerdeva <deva>2008-10-29 10:02:00 +0000
commitaa8483b30a4e824ede7f10e03fdd41d2f28c9947 (patch)
treed858f28e8a88e4305dc71e56179f826d15199d60
parente93751bfd25d70ef3d59b18204f59d6e6be5a911 (diff)
Initial work on format tools
-rw-r--r--server/src/Makefile.am6
-rw-r--r--server/src/formattools.cc78
-rw-r--r--server/src/formattools.h60
3 files changed, 144 insertions, 0 deletions
diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 5e75b32..378c9bd 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -12,6 +12,7 @@ pracrod_SOURCES = \
configuration.cc \
configurationparser.cc \
exception.cc \
+ formattools.cc \
queryhandler.cc \
queryparser.cc \
journal_commit.cc \
@@ -34,6 +35,7 @@ EXTRA_DIST = \
database.h \
debug.h \
exception.h \
+ formattools.h \
queryhandler.h \
queryparser.h \
journal_commit.h \
@@ -50,6 +52,7 @@ EXTRA_DIST = \
xml_encode_decode.h
TESTFILES = \
+ test_formattools \
test_queryhandler \
test_queryparser \
test_luaquerymapper \
@@ -68,6 +71,9 @@ test: $(TESTFILES)
test_clean:
rm -f $(TESTFILES)
+test_formattools: formattools.cc
+ @../../tools/test formattools.cc
+
test_queryhandler: queryhandler.cc
@../../tools/test queryhandler.cc tcpsocket.cc exception.cc log.cc
diff --git a/server/src/formattools.cc b/server/src/formattools.cc
new file mode 100644
index 0000000..883f6ba
--- /dev/null
+++ b/server/src/formattools.cc
@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ * formattools.cc
+ *
+ * Mon Oct 27 09:34:46 CET 2008
+ * Copyright 2008 Bent Bisballe Nyeng
+ * deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ * This file is part of Pracro.
+ *
+ * Pracro 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Pracro 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 Pracro; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+#include "formattools.h"
+
+/**
+ * Replace all ocurrences of c with cc.
+ */
+static std::string escape_string(std::string str, char c)
+{
+ std::string out;
+ for(size_t i = 0; i < str.length(); i++) {
+ if(str[i] == c) out += str[i];
+ out += str[i];
+ }
+ return out;
+}
+
+std::string escape_multilist_string(std::string str)
+{
+ return escape_string(escape_string(str, '{'), '}');
+}
+
+std::string escape_resume_string(std::string str)
+{
+ return escape_string(escape_string(str, '['), ']');
+}
+
+std::map<std::string, std::string> get_multilist_values(std::string str)
+{
+ std::map<std::string, std::string> values;
+ return values;
+}
+
+std::string render_multilist_string(std::string str)
+{
+ return str;
+}
+
+std::string render_resume_string(std::string str)
+{
+ return str;
+}
+
+#ifdef TEST_FORMATTOOLS
+
+int main()
+{
+ if(escape_multilist_string("${} {{}}") != "${{}} {{{{}}}}") return 1;
+ if(escape_resume_string("$[] [[]]") != "$[[]] [[[[]]]]") return 1;
+
+ return 0;
+}
+
+#endif/*TEST_FORMATTOOLS*/
diff --git a/server/src/formattools.h b/server/src/formattools.h
new file mode 100644
index 0000000..fcfb372
--- /dev/null
+++ b/server/src/formattools.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ * formattools.h
+ *
+ * Mon Oct 27 09:34:46 CET 2008
+ * Copyright 2008 Bent Bisballe Nyeng
+ * deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ * This file is part of Pracro.
+ *
+ * Pracro 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Pracro 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 Pracro; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+#ifndef __PRACRO_FORMATTOOLS_H__
+#define __PRACRO_FORMATTOOLS_H__
+
+#include <string>
+#include <map>
+
+/**
+ * Escape all { and } characters.
+ */
+std::string escape_multilist_string(std::string str);
+
+/**
+ * Escape all [ and ] characters.
+ */
+std::string escape_resume_string(std::string str);
+
+/**
+ * Get name/value pair list from multilist result string.
+ */
+std::map<std::string, std::string> get_multilist_values(std::string str);
+
+/**
+ * Render tekst from multilist result string, by inserting the values at the
+ * $[name|value] placeholders and de-escaping [[ and ]].
+ */
+std::string render_multilist_string(std::string str);
+
+/**
+ * Render resume tekst, by running the embedded LUA code and replacing the ${...}
+ * placeholders with the output and de-escaping {{ and }}.
+ */
+std::string render_resume_string(std::string str);
+
+#endif/*__PRACRO_FORMATTOOLS_H__*/