New artefact connection class (to later wrap libartefact). New environment class to hold all global resources. Made ConnectionPool a template class. Split journal code up into two files (class from commit code).

1 files changed, 77 insertions, 0 deletions

diff --git a/server/src/environment.cc b/server/src/environment.cc
new file mode 100644
index 0000000..1cdfaba
--- /dev/null
+++ b/server/src/environment.cc
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set et sw=2 ts=2: */
+/***************************************************************************
+ *            environment.cc
+ *
+ *  Tue Jan  5 11:41:23 CET 2010
+ *  Copyright 2010 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 "environment.h"
+
+#include "configuration.h"
+#include "database.h"
+
+Environment::Environment()
+  : macrolist(Conf::xml_basedir + "/macros"),
+    templatelist(Conf::xml_basedir + "/templates")
+{
+  for(int i = 0; i < Conf::database_poolsize; i++) {
+    dbpool.add(new Database(Conf::database_backend, Conf::database_addr,
+                          "", Conf::database_user, Conf::database_passwd, ""));
+  }
+
+  for(int i = 0; i < Conf::artefact_poolsize; i++) {
+    atfpool.add(new Artefact);
+  }
+}
+
+Environment::~Environment()
+{
+}
+
+/*
+  TCPSocket pentominos_socket;
+#ifndef WITHOUT_PENTOMINOS
+  pentominos_socket.connect(Conf::pentominos_addr, Conf::pentominos_port);
+#endif
+*/
+
+#ifdef TEST_ENVIRONMENT
+//deps: configuration.cc database.cc artefact.cc pracrodao.cc session.cc mutex.cc semaphore.cc debug.cc pracrodaotest.cc pracrodaopgsql.cc journalwriter.cc journal_commit.cc
+//cflags: -I.. $(PQXX_CXXFLAGS)
+//libs: $(PQXX_LIBS) -lpthread
+#include "test.h"
+
+TEST_BEGIN;
+
+Conf::database_backend = "testdb";
+Conf::database_poolsize = 1;
+
+Conf::artefact_poolsize = 1;
+
+Environment env;
+
+// TODO: Put some testcode here (see test.h for usable macros).
+
+TEST_END;
+
+#endif/*TEST_ENVIRONMENT*/