From f0359e8b4450d5074e7d19e95119f05d584a1e74 Mon Sep 17 00:00:00 2001 From: deva Date: Tue, 13 May 2008 09:56:55 +0000 Subject: More filename cleanup.. --- server/src/Makefile.am | 8 ++--- server/src/server.cc | 4 +-- server/src/transactionparser.cc | 80 +++++++++++++++++++++++++++++++++++++++++ server/src/transactionparser.h | 50 ++++++++++++++++++++++++++ server/src/xmlparser.cc | 80 ----------------------------------------- server/src/xmlparser.h | 50 -------------------------- 6 files changed, 136 insertions(+), 136 deletions(-) create mode 100644 server/src/transactionparser.cc create mode 100644 server/src/transactionparser.h delete mode 100644 server/src/xmlparser.cc delete mode 100644 server/src/xmlparser.h diff --git a/server/src/Makefile.am b/server/src/Makefile.am index 621e8dd..251560b 100644 --- a/server/src/Makefile.am +++ b/server/src/Makefile.am @@ -21,10 +21,10 @@ pracrod_SOURCES = \ saxparser.cc \ server.cc \ templateparser.cc \ + transactionparser.cc \ tcpsocket.cc \ tostring.cc \ - uid.cc \ - xmlparser.cc + uid.cc EXTRA_DIST = \ configuration.h \ @@ -43,7 +43,7 @@ EXTRA_DIST = \ saxparser.h \ server.h \ templateparser.h \ + transactionparser.h \ tcpsocket.h \ tostring.h \ - uid.h \ - xmlparser.h + uid.h diff --git a/server/src/server.cc b/server/src/server.cc index 930a6e7..f6c1771 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -38,7 +38,7 @@ #include "configuration.h" #include "transaction.h" -#include "xmlparser.h" +#include "transactionparser.h" #include "database.h" @@ -81,7 +81,7 @@ static void connection(TCPSocket &socket) printf("Got connection...\n"); Transaction transaction; - XMLParser parser(socket, transaction); + TransactionParser parser(socket, transaction); parser.parse(); socket.write("\n"); diff --git a/server/src/transactionparser.cc b/server/src/transactionparser.cc new file mode 100644 index 0000000..9ca6288 --- /dev/null +++ b/server/src/transactionparser.cc @@ -0,0 +1,80 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * transactionparser.cc + * + * Fri Aug 31 09:30:06 CEST 2007 + * Copyright 2007 Bent Bisballe Nyeng, Lars Bisballe Jensen and Peter Skaarup + * deva@aasimon.org, elsenator@gmail.com and piparum@piparum.dk + ****************************************************************************/ + +/* + * 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 "transactionparser.h" + +#include +#include +#include + +#include +#include + +static bool done = false; + +TransactionParser::TransactionParser(TCPSocket &socket, Transaction &transaction) +{ + this->transaction = &transaction; + this->socket = &socket; + done = false; +} + +void TransactionParser::startTag(std::string name, std::map< std::string, std::string> attributes) +{ + if(name == "pracro") { + transaction->user = attributes["user"]; + transaction->cpr = attributes["cpr"]; + transaction->version = attributes["version"]; + } + + if(name == "request") { + Request r; + r.macro = attributes["macro"]; + transaction->requests.push_back(r); + } + + if(name == "commit") { + Commit c; + c.macro = attributes["macro"]; + c.version = attributes["version"]; + transaction->commits.push_back(c); + } + + if(name == "field") { + transaction->commits.back().fields[attributes["name"]] = attributes["value"]; + } +} + +void TransactionParser::endTag(std::string name) +{ + if(name == "pracro") done = true; +} + +int TransactionParser::readData(char *data, size_t size) +{ + if(done) return 0; + return socket->read(data, size); +} diff --git a/server/src/transactionparser.h b/server/src/transactionparser.h new file mode 100644 index 0000000..9528e47 --- /dev/null +++ b/server/src/transactionparser.h @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * transactionparser.h + * + * Fri Aug 31 09:30:06 CEST 2007 + * Copyright 2007 Bent Bisballe Nyeng, Lars Bisballe Jensen and Peter Skaarup + * deva@aasimon.org, elsenator@gmail.com and piparum@piparum.dk + ****************************************************************************/ + +/* + * 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_TRANSACTIONPARSER_H__ +#define __PRACRO_TRANSACTIONPARSER_H__ + +#include "saxparser.h" +#include "tcpsocket.h" +#include "transaction.h" + +class TransactionParser : public SAXParser { +public: + TransactionParser(TCPSocket &socket, Transaction &transaction); + + void startTag(std::string name, std::map< std::string, std::string> attributes); + void endTag(std::string name); + +protected: + int readData(char *data, size_t size); + +private: + Transaction *transaction; + TCPSocket *socket; + bool done; +}; + +#endif/*__PRACRO_TRANSACTIONPARSER_H__*/ diff --git a/server/src/xmlparser.cc b/server/src/xmlparser.cc deleted file mode 100644 index 71bb753..0000000 --- a/server/src/xmlparser.cc +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * xmlparser.cc - * - * Fri Aug 31 09:30:06 CEST 2007 - * Copyright 2007 Bent Bisballe Nyeng, Lars Bisballe Jensen and Peter Skaarup - * deva@aasimon.org, elsenator@gmail.com and piparum@piparum.dk - ****************************************************************************/ - -/* - * 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 "xmlparser.h" - -#include -#include -#include - -#include -#include - -static bool done = false; - -void XMLParser::startTag(std::string name, std::map< std::string, std::string> attributes) -{ - if(name == "pracro") { - transaction->user = attributes["user"]; - transaction->cpr = attributes["cpr"]; - transaction->version = attributes["version"]; - } - - if(name == "request") { - Request r; - r.macro = attributes["macro"]; - transaction->requests.push_back(r); - } - - if(name == "commit") { - Commit c; - c.macro = attributes["macro"]; - c.version = attributes["version"]; - transaction->commits.push_back(c); - } - - if(name == "field") { - transaction->commits.back().fields[attributes["name"]] = attributes["value"]; - } -} - -void XMLParser::endTag(std::string name) -{ - if(name == "pracro") done = true; -} - -int XMLParser::readData(char *data, size_t size) -{ - if(done) return 0; - return socket->read(data, size); -} - -XMLParser::XMLParser(TCPSocket &socket, Transaction &transaction) -{ - this->transaction = &transaction; - this->socket = &socket; - done = false; -} diff --git a/server/src/xmlparser.h b/server/src/xmlparser.h deleted file mode 100644 index 1a37e26..0000000 --- a/server/src/xmlparser.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * xmlparser.h - * - * Fri Aug 31 09:30:06 CEST 2007 - * Copyright 2007 Bent Bisballe Nyeng, Lars Bisballe Jensen and Peter Skaarup - * deva@aasimon.org, elsenator@gmail.com and piparum@piparum.dk - ****************************************************************************/ - -/* - * 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_XMLPARSER_H__ -#define __PRACRO_XMLPARSER_H__ - -#include "saxparser.h" -#include "tcpsocket.h" -#include "transaction.h" - -class XMLParser : public SAXParser { -public: - XMLParser(TCPSocket &socket, Transaction &transaction); - - void startTag(std::string name, std::map< std::string, std::string> attributes); - void endTag(std::string name); - -protected: - int readData(char *data, size_t size); - -private: - Transaction *transaction; - TCPSocket *socket; - bool done; -}; - -#endif/*__PRACRO_XMLPARSER_H__*/ -- cgit v1.2.3