summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
Diffstat (limited to 'server/src')
-rw-r--r--server/src/Makefile.am2
-rw-r--r--server/src/server.cc8
2 files changed, 7 insertions, 3 deletions
diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 6e197c2..93d830a 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -82,7 +82,7 @@ test_macroparser: macroparser.cc
@../../tools/test macroparser.cc saxparser.cc exception.cc log.cc -lexpat -DXML="\"../xml\""
test_server: server.cc
- @../../tools/test server.cc templateparser.cc saxparser.cc queryparser.cc queryhandler.cc luaquerymapper.cc tcpsocket.cc exception.cc log.cc configuration.cc transactionparser.cc widgetgenerator.cc -lexpat $(LUA_LIBS) $(CONFIG_LIBS) -DXML="\"../xml\""
+ @../../tools/test server.cc templateparser.cc saxparser.cc queryparser.cc queryhandler.cc luaquerymapper.cc tcpsocket.cc exception.cc log.cc configuration.cc transactionparser.cc widgetgenerator.cc database.cc macroparser.cc xml_encode_decode.cc -lexpat $(LUA_LIBS) $(CONFIG_LIBS) $(PQXX_LIBS) $(PQXX_CXXFLAGS) -DXML="\"../xml\""
#killall -9 test_server
diff --git a/server/src/server.cc b/server/src/server.cc
index c0ec223..54a2616 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -129,7 +129,8 @@ static void connection(TCPSocket &socket)
tp.parse();
Template *templ = tp.getTemplate();
-
+
+#ifndef WITHOUT_PENTOMINOS
// Send the queries to Pentominos (if any)
TCPSocket s;
s.connect("localhost", 11108);
@@ -151,7 +152,10 @@ static void connection(TCPSocket &socket)
std::string result = qh.exec();
printf("Got result: [%s]\n", result.c_str());
-
+#else
+ std::string result = "";
+#endif/*WITHOUT_PENTOMINOS*/
+
// Parse the result from the queries to pentominos
QueryParser qp(result);
qp.parse();