diff options
Diffstat (limited to 'server/src/server.cc')
-rw-r--r-- | server/src/server.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/server/src/server.cc b/server/src/server.cc index a0dbaa4..2641b8a 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -109,11 +109,6 @@ static std::string handleTransaction(Transaction *transaction, if(resume != "" && store_in_journal) { journalwriter.addEntry(*transaction, commit, resume, commit.course); - /* - journal_commit(transaction->cpr.c_str(), transaction->user.c_str(), - Conf::journal_commit_addr.c_str(), Conf::journal_commit_port, - resume.c_str(), resume.length()); - */ } i++; @@ -145,8 +140,8 @@ static std::string handleTransaction(Transaction *transaction, bool foundmacro = false; // Generate the macro and return it to the client - std::vector< Macro >::iterator mi2 = templ->course.macroes.begin(); - while(mi2 != templ->course.macroes.end()) { + std::vector< Macro >::iterator mi2 = templ->course.macros.begin(); + while(mi2 != templ->course.macros.end()) { Macro ¯o = (*mi2); // FIXME: This is to be made in some other way in a later version. |