commit 3ae5294c

sago007 · 2012-03-20 19:37
3ae5294c142e9c187189348f36ba8cabcec81408 patch · browse files
parent 046b720a9138bbc4da06e7b0f1a6f1d993ba2ad2

Fixed a bug that prevented awards challenges and harvester events from being written to DB


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

Changed files

M	src/oss2db/Award2Db.cpp before
M	src/oss2db/Challenge2Db.cpp before
M	src/oss2db/Harvester2Db.cpp before

diff --git a/src/oss2db/Award2Db.cpp b/src/oss2db/Award2Db.cpp index 66a5afc..a142b65 100644 --- a/src/oss2db/Award2Db.cpp +++ b/src/oss2db/Award2Db.cpp

@@ -23,7 +23,7 @@ void Award2Db::process(OaStatStruct oss) {

if(!canProcess(oss))

return; //Invalid oss

- if(oss.parameters.at(0)>-1 && oss.parameters.at(0)<MAX_ID)

+ if(oss.parameters.at(0)==-1)

return; //Not valid player

string player = clientIdMap.at(oss.parameters.at(0));

diff --git a/src/oss2db/Challenge2Db.cpp b/src/oss2db/Challenge2Db.cpp index 5303478..cea93dd 100644 --- a/src/oss2db/Challenge2Db.cpp +++ b/src/oss2db/Challenge2Db.cpp

@@ -22,7 +22,7 @@ void Challenge2Db::process(OaStatStruct oss) {

if(!canProcess(oss))

return; //Invalid oss

- if(oss.parameters.at(0)>-1 && oss.parameters.at(0)<MAX_ID)

+ if(oss.parameters.at(0)==-1)

return; //Not valid player

string player = clientIdMap.at(oss.parameters.at(0));

diff --git a/src/oss2db/Harvester2Db.cpp b/src/oss2db/Harvester2Db.cpp index b538216..90f4928 100644 --- a/src/oss2db/Harvester2Db.cpp +++ b/src/oss2db/Harvester2Db.cpp

@@ -24,13 +24,13 @@ void Harvester2Db::process(OaStatStruct oss) {

string player1 = ""; //Parameter 0

string player2 = ""; //Parameter 3

- if(oss.parameters.at(0)>-1 && oss.parameters.at(0)<MAX_ID) {

+ if(oss.parameters.at(0)>-1 && oss.parameters.at(0)<clientIdMap.size() && oss.parameters.at(0)!=1022) {

player1 = clientIdMap.at(oss.parameters.at(0));

} else {

player1 = "WORLD";

}

- if(oss.parameters.at(3)>-1 && oss.parameters.at(3)<MAX_ID) {

+ if(oss.parameters.at(3)>-1 && oss.parameters.at(3)<clientIdMap.size() && oss.parameters.at(3)!=1022) {

player2 = clientIdMap.at(oss.parameters.at(3));

} else {

player2 = "WORLD";