git repos / oastat

commit 71ef0911

sago007 · 2011-01-15 19:55
71ef0911ff1e58d862bfff4fa94434c5bad769c4 patch · browse files
parent 16b32974838b20151f4ee11b304411096970d248 

Now use canProcess internally in all functions


git-svn-id: http://oastat.googlecode.com/svn/trunk@15 a36be8df-c75f-1e49-46ad-4f0ee64bdc62

Changed files

M src/oss2db/Award2Db.cpp before
M src/oss2db/Ctf1f2Db.cpp before
M src/oss2db/Ctf2Db.cpp before
M src/oss2db/Disconnect2Db.cpp before
M src/oss2db/Elimination2Db.cpp before
M src/oss2db/Point2Db.cpp before
M src/oss2db/kill2db.cpp before
M src/oss2db/shutdown2db.cpp before
M src/oss2db/userinfo2db.cpp before
diff --git a/src/oss2db/Award2Db.cpp b/src/oss2db/Award2Db.cpp index e392d97..62fa6fe 100644 --- a/src/oss2db/Award2Db.cpp +++ b/src/oss2db/Award2Db.cpp
@@ -29,7 +29,7 @@ bool Award2Db::canProcess(OaStatStruct oss) {
}
void Award2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<2 || oss.parameters.at(0)<0)
+ if(!canProcess(oss))
return; //Invalid oss
string player = clientIdMap[oss.parameters.at(0)];
diff --git a/src/oss2db/Ctf1f2Db.cpp b/src/oss2db/Ctf1f2Db.cpp index 3776aca..9693a78 100644 --- a/src/oss2db/Ctf1f2Db.cpp +++ b/src/oss2db/Ctf1f2Db.cpp
@@ -27,7 +27,7 @@ bool Ctf1f2Db::canProcess(OaStatStruct oss) {
}
void Ctf1f2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<3 || oss.parameters.at(0)<0)
+ if(!canProcess(oss))
return; //Invalid oss
string player = "";
diff --git a/src/oss2db/Ctf2Db.cpp b/src/oss2db/Ctf2Db.cpp index 8b0a247..d3dff60 100644 --- a/src/oss2db/Ctf2Db.cpp +++ b/src/oss2db/Ctf2Db.cpp
@@ -28,7 +28,7 @@ bool Ctf2Db::canProcess(OaStatStruct oss) {
}
void Ctf2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<3 || oss.parameters.at(0)<0)
+ if(!canProcess(oss))
return; //Invalid oss
string player = "";
diff --git a/src/oss2db/Disconnect2Db.cpp b/src/oss2db/Disconnect2Db.cpp index c5c8b92..2947c64 100644 --- a/src/oss2db/Disconnect2Db.cpp +++ b/src/oss2db/Disconnect2Db.cpp
@@ -41,7 +41,7 @@ bool Disconnect2Db::canProcess(OaStatStruct oss) {
}
void Disconnect2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<1)
+ if(!canProcess(oss))
return; //Invalid oss
string player = clientIdMap[oss.parameters.at(0)];
diff --git a/src/oss2db/Elimination2Db.cpp b/src/oss2db/Elimination2Db.cpp index 925b43f..e0abf80 100644 --- a/src/oss2db/Elimination2Db.cpp +++ b/src/oss2db/Elimination2Db.cpp
@@ -27,7 +27,7 @@ bool Elimination2Db::canProcess(OaStatStruct oss) {
}
void Elimination2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<3 || oss.parameters.at(0)<0)
+ if(!canProcess(oss))
return; //Invalid oss
dp->addElimination(oss.second,oss.parameters.at(0) /*roundnumber*/,oss.parameters.at(1) /*team*/, oss.parameters.at(2) /*event*/);
diff --git a/src/oss2db/Point2Db.cpp b/src/oss2db/Point2Db.cpp index ecf5601..2e6d893 100644 --- a/src/oss2db/Point2Db.cpp +++ b/src/oss2db/Point2Db.cpp
@@ -27,7 +27,7 @@ bool Point2Db::canProcess(OaStatStruct oss) {
}
void Point2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<2 || oss.parameters.at(0)<0)
+ if(!canProcess(oss))
return; //Invalid oss
string player = clientIdMap[oss.parameters.at(0)];
diff --git a/src/oss2db/kill2db.cpp b/src/oss2db/kill2db.cpp index 86e7031..8d2d5dd 100644 --- a/src/oss2db/kill2db.cpp +++ b/src/oss2db/kill2db.cpp
@@ -33,7 +33,7 @@ bool Kill2Db::canProcess(OaStatStruct oss) {
}
void Kill2Db::process(OaStatStruct oss) {
- if(oss.command != "Kill" || oss.parameters.size()<=3)
+ if(!canProcess(oss))
return; //Invalid oss
string target = ""; //Parameter 1
string killer = ""; //Parameter 0
diff --git a/src/oss2db/shutdown2db.cpp b/src/oss2db/shutdown2db.cpp index 5fd454d..14ba7ea 100644 --- a/src/oss2db/shutdown2db.cpp +++ b/src/oss2db/shutdown2db.cpp
@@ -42,7 +42,7 @@ bool Shutdown2Db::canProcess(OaStatStruct oss) {
}
void Shutdown2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand())
+ if(!canProcess(oss))
return;
dp->endGame(oss.second);
}
diff --git a/src/oss2db/userinfo2db.cpp b/src/oss2db/userinfo2db.cpp index 1bdd0b5..f1dca63 100644 --- a/src/oss2db/userinfo2db.cpp +++ b/src/oss2db/userinfo2db.cpp
@@ -42,7 +42,7 @@ bool Userinfo2Db::canProcess(OaStatStruct oss) {
}
void Userinfo2Db::process(OaStatStruct oss) {
- if(oss.command != getCommand() || oss.parameters.size()<1)
+ if(!canProcess(oss))
return; //Invalid oss
map<string,string> arguments = oss.GetInfostring();