diff --git a/src/db/Db2DbiXX.cpp b/src/db/Db2DbiXX.cpp index 3f3e4e5..5b54c17 100644 --- a/src/db/Db2DbiXX.cpp +++ b/src/db/Db2DbiXX.cpp @@ -25,6 +25,9 @@ http://code.google.com/p/oastat/ #include "Db2DbiXX.hpp" + +using namespace dbixx; + void Db2DbiXX::InitStrings(const string &backend) { last_value = false; diff --git a/src/db/Db2DbiXX.hpp b/src/db/Db2DbiXX.hpp index 26fb845..bf27c44 100644 --- a/src/db/Db2DbiXX.hpp +++ b/src/db/Db2DbiXX.hpp @@ -31,8 +31,6 @@ http://code.google.com/p/oastat/ #include #include -using namespace dbixx; - class Db2DbiXX : public Database { public: @@ -60,8 +58,8 @@ public: void addGenericTeamEvent(int second, int team, int amount, const std::string &gametype, const std::string &player1, const std::string &player2, int event, int generic1); void doNotCommit(); private: - session *sql; - transaction *commitlock; + dbixx::session *sql; + dbixx::transaction *commitlock; bool isok; bool debug; int gamenumber; /** Gamenumber we are currently working on */ @@ -72,16 +70,16 @@ private: void Rollback(); bool Ok(); void SetOk(bool ok); - void DebugMessage(const string &msg); - void InitStrings(const string &backend); + void DebugMessage(const std::string &msg); + void InitStrings(const std::string &backend); void ReadConfigFromDb(); - bool IsDuplicate(const string &servername, const tm &thetime); - int getPlayerId(const string &guid); + bool IsDuplicate(const std::string &servername, const tm &thetime); + int getPlayerId(const std::string &guid); std::map playerids; - string sql_backend; + std::string sql_backend; bool last_value; - set cvars2save; - set uservars2save; + std::set cvars2save; + std::set uservars2save; }; #endif /* DB2DBIXX_HPP */ diff --git a/src/oastat.cpp b/src/oastat.cpp index 65046d6..69c4f29 100644 --- a/src/oastat.cpp +++ b/src/oastat.cpp @@ -35,12 +35,6 @@ http://code.google.com/p/oastat/ #include #include - -using std::string; -using std::vector; -using std::list; -using std::ifstream; - #include "db/database.hpp" #ifdef USEDBIXX #include "db/Db2DbiXX.hpp" @@ -70,9 +64,9 @@ using std::ifstream; #include "oss2db/Challenge2Db.hpp" #include "oss2db/Warmup2Db.hpp" -vector clientIdMap; +std::vector clientIdMap; -static int processStdIn(istream &in_p,vector > &commands); +static int processStdIn(std::istream &in_p,std::vector > &commands); @@ -82,10 +76,10 @@ static int processStdIn(istream &in_p,vector > &com * * @param[in] db The database object. May not be freed once given as an argument to this function */ -static void addCommands(boost::shared_ptr &db,vector > &commands) +static void addCommands(boost::shared_ptr &db,std::vector > &commands) { if (!db) { - throw runtime_error("db was uninizialized in addCommands"); + throw std::runtime_error("db was uninizialized in addCommands"); } //Add new commands here @@ -113,17 +107,17 @@ static void addCommands(boost::shared_ptr &db,vector > &commands) +static int processStdIn(std::istream &in_p, std::vector > &commands) { bool done = true; OaStatStruct *startstruct; startstruct = NULL; do { - string line = ""; + std::string line = ""; OaStatStruct oss; - list osslist; + std::list osslist; try { - while ( getline(in_p,line) ) { + while ( std::getline(in_p,line) ) { oss.clear(); oss.parseLine(line); osslist.push_back(oss); @@ -164,8 +158,8 @@ static int processStdIn(istream &in_p,vector > &com If there is an error write it in the log and try again continue */ osslist.clear(); - cerr << "oastat: Crashed (NEAR FATAL EXCEPTION) at line: \"" << line << "\"" << endl << - "oastat: Error is: " << e2.what() << endl; + std::cerr << "oastat: Crashed (NEAR FATAL EXCEPTION) at line: \"" << line << "\"\n"<< + "oastat: Error is: " << e2.what() << "\n"; done = false; } } while (!done); @@ -178,7 +172,7 @@ static int processStdIn(istream &in_p,vector > &com * @param unhashedID - The unhashed id * @return the hashed id */ -string getHashedId(string unhashedID) +std::string getHashedId(std::string unhashedID) { int msg_len = unhashedID.length(); int hash_len = gcry_md_get_algo_dlen( GCRY_MD_SHA1 ); @@ -200,12 +194,12 @@ string getHashedId(string unhashedID) int main (int argc, const char* argv[]) { try { - string dbargs = ""; - string filename = ""; - string backend = "Xml"; + std::string dbargs = ""; + std::string filename = ""; + std::string backend = "Xml"; bool useTail = false; bool doIntegrationTest = false; - vector > commands; + std::vector > commands; ///////////// //dbargs = "mysql dbname oastat"; boost::format f("%1%/.openarena/baseoa/games.log"); @@ -215,10 +209,10 @@ int main (int argc, const char* argv[]) boost::program_options::options_description desc("Allowed options"); desc.add_options() ("help,h", "Print basic usage information to stdout and quits") - ("backend", boost::program_options::value(), "The DB backend to use") - ("dbargs", boost::program_options::value(), "Arguments passed to the DB backend") - ("filename,f", boost::program_options::value(), "Filename to read. Providing a blank string will read from stdin") - ("config,c", boost::program_options::value >(), "Read a config file with the values. Can be given multiple times") + ("backend", boost::program_options::value(), "The DB backend to use") + ("dbargs", boost::program_options::value(), "Arguments passed to the DB backend") + ("filename,f", boost::program_options::value(), "Filename to read. Providing a blank string will read from stdin") + ("config,c", boost::program_options::value >(), "Read a config file with the values. Can be given multiple times") ("tail", "Use tail on the filename given to read the file. This will be ignored on Windows.") ("integration-test", "Perform integration test") ; @@ -226,32 +220,32 @@ int main (int argc, const char* argv[]) boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm); boost::program_options::notify(vm); if (vm.count("config")) { - vector config_filenames = vm["config"].as >(); - for ( const string& s : config_filenames) { - ifstream config_file(s); + std::vector config_filenames = vm["config"].as >(); + for ( const std::string& s : config_filenames) { + std::ifstream config_file(s); store(parse_config_file(config_file, desc), vm); notify(vm); } } if (vm.count("help")) { - cout << desc << endl; - cout << "Examples: " << endl; - cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"DbiXX\" --dbarg \"mysql dbname oastat username openarena\"" << endl; - cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"DbiXX\" --dbarg \"pgsql dbname oastat username openarena\"" << endl; - cout << argv[0] << " -f %APPDATA%/OpenArena/baseoa/games.log --backend \"CppDb\" --dbarg \"sqlite3:db=defoastat.db3\"" << endl; - cout << "tail -f \"~/.openarena/baseoa/games.log\" | "<< argv[0] << " -f \"\" --backend \"Xml\" --dbarg \"outputdir ~/oastat\"" << endl; - cout << endl; - cout << "Look at https://github.com/sago007/oastat for more help and more details" << endl; + std::cout << desc << "n"; + std::cout << "Examples: \n"; + std::cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"DbiXX\" --dbarg \"mysql dbname oastat username openarena\"\n"; + std::cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"DbiXX\" --dbarg \"pgsql dbname oastat username openarena\"\n"; + std::cout << argv[0] << " -f %APPDATA%/OpenArena/baseoa/games.log --backend \"CppDb\" --dbarg \"sqlite3:db=defoastat.db3\"\n"; + std::cout << "tail -f \"~/.openarena/baseoa/games.log\" | "<< argv[0] << " -f \"\" --backend \"Xml\" --dbarg \"outputdir ~/oastat\"\n"; + std::cout << "\n"; + std::cout << "Look at https://github.com/sago007/oastat for more help and more details\n"; return 1; } if (vm.count("backend")) { - backend = vm["backend"].as(); + backend = vm["backend"].as(); } if (vm.count("dbargs")) { - dbargs = vm["dbargs"].as(); + dbargs = vm["dbargs"].as(); } if (vm.count("filename")) { - filename = vm["filename"].as(); + filename = vm["filename"].as(); } if (vm.count("tail")) { useTail = true; @@ -273,7 +267,7 @@ int main (int argc, const char* argv[]) #endif #if USECPPDB if (backend == "CppDb") { - cout << "Using CppDb" << endl; + std::cout << "Using CppDb\n"; if (dbargs.length()<1) { db = boost::shared_ptr(new Db2CppDb() ); } else { @@ -282,7 +276,7 @@ int main (int argc, const char* argv[]) } #endif if (backend == "Xml") { - cout << "Using XML" << endl; + std::cout << "Using XML\n"; if (dbargs.length()<1) { db = boost::shared_ptr(new Db2Xml() ); } else { @@ -291,9 +285,9 @@ int main (int argc, const char* argv[]) } if (!db) { - string error("Failed to find backend: "); + std::string error("Failed to find backend: "); error += backend; - throw runtime_error(error); + throw std::runtime_error(error); } addCommands(db,commands); @@ -303,7 +297,7 @@ int main (int argc, const char* argv[]) oss_test.setTimeStamp("2013-12-08 20:42:30"); db->startGame(1,"oasago2","baseoa-mod","testserver",oss_test); db->addGenericTeamEvent(5,2,0,"sometype","","",3,4); - cerr << "Test called" << endl; + std::cerr << "Test called\n"; return 1; } @@ -316,15 +310,15 @@ int main (int argc, const char* argv[]) else #endif { - ifstream in(filename.c_str(),ifstream::in); + std::ifstream in(filename.c_str(), std::ifstream::in); processStdIn(in,commands); } } else { - processStdIn(cin,commands); + processStdIn(std::cin, commands); } } catch (std::exception &e) { - cerr << "Crashed: " << e.what() << endl; + std::cerr << "Crashed: " << e.what() << "\n"; return 2; } diff --git a/src/oss2db/Accuracy2Db.cpp b/src/oss2db/Accuracy2Db.cpp index 505ac02..e56398a 100644 --- a/src/oss2db/Accuracy2Db.cpp +++ b/src/oss2db/Accuracy2Db.cpp @@ -25,7 +25,7 @@ http://code.google.com/p/oastat/ #include -string Accuracy2Db::getCommand() const +std::string Accuracy2Db::getCommand() const { return "Accuracy"; } @@ -48,9 +48,9 @@ void Accuracy2Db::process(const OaStatStruct &oss) return; //Not valid player } - string player = clientIdMap.at(oss.parameters.at(0)); + std::string player = clientIdMap.at(oss.parameters.at(0)); - map arguments = oss.GetInfostring(); + std::map arguments = oss.GetInfostring(); boost::format hformat("h%1%"); boost::format fformat("f%1%"); diff --git a/src/oss2db/Accuracy2Db.hpp b/src/oss2db/Accuracy2Db.hpp index ccb214d..376f0d0 100644 --- a/src/oss2db/Accuracy2Db.hpp +++ b/src/oss2db/Accuracy2Db.hpp @@ -29,7 +29,7 @@ http://code.google.com/p/oastat/ class Accuracy2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Award2Db.cpp b/src/oss2db/Award2Db.cpp index 3edb23b..efdeab9 100644 --- a/src/oss2db/Award2Db.cpp +++ b/src/oss2db/Award2Db.cpp @@ -25,7 +25,7 @@ http://code.google.com/p/oastat/ -string Award2Db::getCommand() const +std::string Award2Db::getCommand() const { return "Award"; } @@ -48,7 +48,7 @@ void Award2Db::process(const OaStatStruct &oss) return; //Not valid player } - string player = clientIdMap.at(oss.parameters.at(0)); + std::string player = clientIdMap.at(oss.parameters.at(0)); dp->addAward(oss.second,player,oss.parameters.at(1)); } \ No newline at end of file diff --git a/src/oss2db/Award2Db.h b/src/oss2db/Award2Db.h index 0b67797..580c4c4 100644 --- a/src/oss2db/Award2Db.h +++ b/src/oss2db/Award2Db.h @@ -31,7 +31,7 @@ class Award2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Challenge2Db.cpp b/src/oss2db/Challenge2Db.cpp index d6e0142..2e8c349 100644 --- a/src/oss2db/Challenge2Db.cpp +++ b/src/oss2db/Challenge2Db.cpp @@ -23,7 +23,7 @@ http://code.google.com/p/oastat/ #include "Challenge2Db.hpp" -string Challenge2Db::getCommand() const +std::string Challenge2Db::getCommand() const { return "Challenge"; } @@ -47,7 +47,7 @@ void Challenge2Db::process(const OaStatStruct &oss) return; //Not valid player } - string player = clientIdMap.at(oss.parameters.at(0)); + std::string player = clientIdMap.at(oss.parameters.at(0)); dp->addChallenge(oss.second,player,oss.parameters.at(1),oss.parameters.at(2)); } \ No newline at end of file diff --git a/src/oss2db/Challenge2Db.hpp b/src/oss2db/Challenge2Db.hpp index 295a0e0..e01f32c 100644 --- a/src/oss2db/Challenge2Db.hpp +++ b/src/oss2db/Challenge2Db.hpp @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Challenge2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Ctf1f2Db.cpp b/src/oss2db/Ctf1f2Db.cpp index c5460b2..68ed68e 100644 --- a/src/oss2db/Ctf1f2Db.cpp +++ b/src/oss2db/Ctf1f2Db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "Ctf1f2Db.hpp" -string Ctf1f2Db::getCommand() const +std::string Ctf1f2Db::getCommand() const { return "1FCTF"; } @@ -43,7 +43,7 @@ void Ctf1f2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player = ""; + std::string player = ""; if (oss.parameters.at(0)!=-1) { player= clientIdMap.at(oss.parameters.at(0)); } diff --git a/src/oss2db/Ctf1f2Db.hpp b/src/oss2db/Ctf1f2Db.hpp index 50a594d..d59a1fc 100644 --- a/src/oss2db/Ctf1f2Db.hpp +++ b/src/oss2db/Ctf1f2Db.hpp @@ -31,7 +31,7 @@ class Ctf1f2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Ctf2Db.cpp b/src/oss2db/Ctf2Db.cpp index 51eb73a..6ac587d 100644 --- a/src/oss2db/Ctf2Db.cpp +++ b/src/oss2db/Ctf2Db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "Ctf2Db.hpp" -string Ctf2Db::getCommand() const +std::string Ctf2Db::getCommand() const { return "CTF"; } @@ -43,7 +43,7 @@ void Ctf2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player = ""; + std::string player = ""; if (oss.parameters.at(0)!=-1) { player= clientIdMap.at(oss.parameters.at(0)); } diff --git a/src/oss2db/Ctf2Db.hpp b/src/oss2db/Ctf2Db.hpp index 88ebf05..f0b5b36 100644 --- a/src/oss2db/Ctf2Db.hpp +++ b/src/oss2db/Ctf2Db.hpp @@ -31,7 +31,7 @@ class Ctf2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/CtfElimination2Db.cpp b/src/oss2db/CtfElimination2Db.cpp index 84d9aa2..d66835e 100644 --- a/src/oss2db/CtfElimination2Db.cpp +++ b/src/oss2db/CtfElimination2Db.cpp @@ -23,7 +23,7 @@ http://code.google.com/p/oastat/ #include "CtfElimination2Db.hpp" -string CtfElimination2Db::getCommand() const +std::string CtfElimination2Db::getCommand() const { return "ELIMINATION"; } @@ -42,7 +42,7 @@ void CtfElimination2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player = ""; + std::string player = ""; if (oss.parameters.at(1)!=-1) { player= clientIdMap.at(oss.parameters.at(1)); } diff --git a/src/oss2db/CtfElimination2Db.hpp b/src/oss2db/CtfElimination2Db.hpp index 9c48089..b5bb71b 100644 --- a/src/oss2db/CtfElimination2Db.hpp +++ b/src/oss2db/CtfElimination2Db.hpp @@ -31,7 +31,7 @@ http://code.google.com/p/oastat/ class CtfElimination2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Disconnect2Db.cpp b/src/oss2db/Disconnect2Db.cpp index c63e63b..9d8e3b6 100644 --- a/src/oss2db/Disconnect2Db.cpp +++ b/src/oss2db/Disconnect2Db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "Disconnect2Db.h" -string Disconnect2Db::getCommand() const +std::string Disconnect2Db::getCommand() const { return "ClientDisconnect"; } @@ -43,7 +43,7 @@ void Disconnect2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player = clientIdMap.at(oss.parameters.at(0)); + std::string player = clientIdMap.at(oss.parameters.at(0)); dp->setPlayerInfo(player,"",false,oss.second,-1,"","",-1); } diff --git a/src/oss2db/Disconnect2Db.h b/src/oss2db/Disconnect2Db.h index 842e5dc..5dd09cc 100644 --- a/src/oss2db/Disconnect2Db.h +++ b/src/oss2db/Disconnect2Db.h @@ -31,7 +31,7 @@ class Disconnect2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Elimination2Db.cpp b/src/oss2db/Elimination2Db.cpp index 2774045..5d3aac9 100644 --- a/src/oss2db/Elimination2Db.cpp +++ b/src/oss2db/Elimination2Db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "Elimination2Db.hpp" -string Elimination2Db::getCommand() const +std::string Elimination2Db::getCommand() const { return "ELIMINATION"; } diff --git a/src/oss2db/Elimination2Db.hpp b/src/oss2db/Elimination2Db.hpp index 28f7058..3c5e494 100644 --- a/src/oss2db/Elimination2Db.hpp +++ b/src/oss2db/Elimination2Db.hpp @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Elimination2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Harvester2Db.cpp b/src/oss2db/Harvester2Db.cpp index c1a93a7..7603a0d 100644 --- a/src/oss2db/Harvester2Db.cpp +++ b/src/oss2db/Harvester2Db.cpp @@ -23,7 +23,7 @@ http://code.google.com/p/oastat/ #include "Harvester2Db.hpp" -string Harvester2Db::getCommand() const +std::string Harvester2Db::getCommand() const { return "HARVESTER"; } @@ -42,8 +42,8 @@ void Harvester2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player1 = ""; //Parameter 0 - string player2 = ""; //Parameter 3 + std::string player1 = ""; //Parameter 0 + std::string player2 = ""; //Parameter 3 if (oss.parameters.at(0)>-1 && oss.parameters.at(0)<(int)clientIdMap.size() && oss.parameters.at(0)!=1022) { player1 = clientIdMap.at(oss.parameters.at(0)); diff --git a/src/oss2db/Harvester2Db.hpp b/src/oss2db/Harvester2Db.hpp index 4455ea6..761d955 100644 --- a/src/oss2db/Harvester2Db.hpp +++ b/src/oss2db/Harvester2Db.hpp @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Harvester2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Point2Db.cpp b/src/oss2db/Point2Db.cpp index c3a1a34..1f34cbf 100644 --- a/src/oss2db/Point2Db.cpp +++ b/src/oss2db/Point2Db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "Point2Db.hpp" -string Point2Db::getCommand() const +std::string Point2Db::getCommand() const { return "PlayerScore"; } @@ -43,7 +43,7 @@ void Point2Db::process(const OaStatStruct &oss) return; //Invalid oss } - string player = clientIdMap.at(oss.parameters.at(0)); + std::string player = clientIdMap.at(oss.parameters.at(0)); dp->addScoreInfo(oss.second,player,oss.parameters.at(1)); } diff --git a/src/oss2db/Point2Db.hpp b/src/oss2db/Point2Db.hpp index 8304781..8c16560 100644 --- a/src/oss2db/Point2Db.hpp +++ b/src/oss2db/Point2Db.hpp @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Point2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/Warmup2Db.cpp b/src/oss2db/Warmup2Db.cpp index 4683f5b..bb30694 100644 --- a/src/oss2db/Warmup2Db.cpp +++ b/src/oss2db/Warmup2Db.cpp @@ -23,7 +23,7 @@ http://code.google.com/p/oastat/ #include "Warmup2Db.hpp" -string Warmup2Db::getCommand() const +std::string Warmup2Db::getCommand() const { return "Warmup"; } diff --git a/src/oss2db/Warmup2Db.hpp b/src/oss2db/Warmup2Db.hpp index 8d53243..9f3bf57 100644 --- a/src/oss2db/Warmup2Db.hpp +++ b/src/oss2db/Warmup2Db.hpp @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Warmup2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/init2db.cpp b/src/oss2db/init2db.cpp index f75b379..6ef9ef4 100644 --- a/src/oss2db/init2db.cpp +++ b/src/oss2db/init2db.cpp @@ -25,7 +25,7 @@ http://code.google.com/p/oastat/ #include -string Init2Db::getCommand() const +std::string Init2Db::getCommand() const { return "InitGame"; } @@ -44,15 +44,15 @@ void Init2Db::process(const OaStatStruct &oss) return; //Invalid oss } OaStatStruct oss_copy(oss); - map arguments = oss_copy.GetInfostring(); + std::map arguments = oss_copy.GetInfostring(); int gametype = atoi(arguments["g_gametype"].c_str()); - string basegame = arguments["gamename"]; - string mapname = arguments["mapname"]; - string servername = arguments["sv_hostname"]; + std::string basegame = arguments["gamename"]; + std::string mapname = arguments["mapname"]; + std::string servername = arguments["sv_hostname"]; oss_copy.setTimeStamp(arguments["g_timestamp"]); dp->startGame(gametype,mapname,basegame,servername,oss_copy); - map::iterator it; + std::map::iterator it; for (it = arguments.begin(); it != arguments.end(); it++) { if( it->first == "g_gametype" || diff --git a/src/oss2db/init2db.h b/src/oss2db/init2db.h index eecdaaf..b527008 100644 --- a/src/oss2db/init2db.h +++ b/src/oss2db/init2db.h @@ -31,7 +31,7 @@ class Init2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/kill2db.cpp b/src/oss2db/kill2db.cpp index b14f1f3..d48f27d 100644 --- a/src/oss2db/kill2db.cpp +++ b/src/oss2db/kill2db.cpp @@ -24,7 +24,7 @@ http://code.google.com/p/oastat/ #include "kill2db.h" -string Kill2Db::getCommand() const +std::string Kill2Db::getCommand() const { return "Kill"; } @@ -42,8 +42,8 @@ void Kill2Db::process(const OaStatStruct &oss) if (!canProcess(oss)) { return; //Invalid oss } - string target = ""; //Parameter 1 - string killer = ""; //Parameter 0 + std::string target = ""; //Parameter 1 + std::string killer = ""; //Parameter 0 //mod is parameter 2 if (oss.parameters.at(1)>-1 && oss.parameters.at(1)<(int)clientIdMap.size() && oss.parameters.at(1)!=1022 ) { target = clientIdMap.at(oss.parameters.at(1)); diff --git a/src/oss2db/kill2db.h b/src/oss2db/kill2db.h index 85ddac9..e6e766b 100644 --- a/src/oss2db/kill2db.h +++ b/src/oss2db/kill2db.h @@ -30,7 +30,7 @@ http://code.google.com/p/oastat/ class Kill2Db : public Struct2Db { - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/shutdown2db.cpp b/src/oss2db/shutdown2db.cpp index 38585a3..3e987da 100644 --- a/src/oss2db/shutdown2db.cpp +++ b/src/oss2db/shutdown2db.cpp @@ -25,7 +25,7 @@ http://code.google.com/p/oastat/ -string Shutdown2Db::getCommand() const +std::string Shutdown2Db::getCommand() const { return "ShutdownGame"; } diff --git a/src/oss2db/shutdown2db.h b/src/oss2db/shutdown2db.h index dc69f01..b207473 100644 --- a/src/oss2db/shutdown2db.h +++ b/src/oss2db/shutdown2db.h @@ -31,7 +31,7 @@ class Shutdown2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const; void process(const OaStatStruct &oss); diff --git a/src/oss2db/struct2db.h b/src/oss2db/struct2db.h index 7920dc6..2894ff9 100644 --- a/src/oss2db/struct2db.h +++ b/src/oss2db/struct2db.h @@ -29,8 +29,6 @@ http://code.google.com/p/oastat/ #include #include -using namespace std; - /* This is the struct to database class that all classes that interpret a log line must inherit */ diff --git a/src/oss2db/userinfo2db.cpp b/src/oss2db/userinfo2db.cpp index 2acf537..866b752 100644 --- a/src/oss2db/userinfo2db.cpp +++ b/src/oss2db/userinfo2db.cpp @@ -27,7 +27,7 @@ http://code.google.com/p/oastat/ #include -string Userinfo2Db::getCommand() const +std::string Userinfo2Db::getCommand() const { return "ClientUserinfoChanged"; } @@ -46,7 +46,7 @@ void Userinfo2Db::process(const OaStatStruct &oss) return; //Invalid oss } bool isBot = false; - map arguments = oss.GetInfostring(); + std::map arguments = oss.GetInfostring(); //grow clientIdMap until oss.parameters.at(0)+1 while ((int)clientIdMap.size() < oss.parameters.at(0)+2) { @@ -65,7 +65,7 @@ void Userinfo2Db::process(const OaStatStruct &oss) clientIdMap[oss.parameters.at(0)] = (boost::format("%1%_client%2%") % arguments["n"] % oss.parameters.at(0) ).str(); isBot = true; } - string player = clientIdMap[oss.parameters.at(0)]; + std::string player = clientIdMap[oss.parameters.at(0)]; dp->setPlayerInfo(player,arguments["n"],isBot,oss.second,atoi(arguments["t"].c_str()), arguments["model"],arguments["hmodel"],-1); } diff --git a/src/oss2db/userinfo2db.h b/src/oss2db/userinfo2db.h index 51abffe..4bc7961 100644 --- a/src/oss2db/userinfo2db.h +++ b/src/oss2db/userinfo2db.h @@ -31,7 +31,7 @@ class Userinfo2Db : public Struct2Db { public: - string getCommand() const; + std::string getCommand() const; bool canProcess(const OaStatStruct &oss) const;