livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -r 78173:78397 search-milestone2-1 for classified click-through logging for Streambase so data warehousing can figure out ROI/purchase history immediately after a teleport from an ad. DEV-9204

master
James Cook 2008-01-24 23:26:05 +00:00
parent ed517c3b14
commit 9617ae17ce
3 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcommon/lllog.cpp
View File

@ -69,7 +69,8 @@ void LLLogImpl::log(const std::string message, LLSD& info)
}
}
}
llinfos << "LLLOGMESSAGE (" << (sequence++) << ") " << message << " " << LLSDNotationStreamer(info) << llendl;
llinfos << "LLLOGMESSAGE (" << (sequence++) << ") " << message
<< " " << LLSDNotationStreamer(info) << llendl;
}
//@brief Function to check if specified legacy log message should be sent.

43
indra/newview/llpanelclassified.cpp
View File

@ -104,6 +104,9 @@ public:
static LLDispatchClassifiedClickThrough sClassifiedClickThrough;
/* Re-expose this if we need to have classified ad HTML detail
pages. JC
// We need to count classified teleport clicks from the search HTML detail pages,
// so we need have a teleport that also sends a click count message.
class LLClassifiedTeleportHandler : public LLCommandHandler
@ -139,7 +142,7 @@ public:
};
// Creating the object registers with the dispatcher.
LLClassifiedTeleportHandler gClassifiedTeleportHandler;
*/
LLPanelClassified::LLPanelClassified(BOOL in_finder, bool from_search)
: LLPanel("Classified Panel"),
@ -881,7 +884,7 @@ void LLPanelClassified::onClickTeleport(void* data)
gAgent.teleportViaLocation(self->mPosGlobal);
gFloaterWorldMap->trackLocation(self->mPosGlobal);
sendClassifiedClickMessage(self->mClassifiedID, "teleport", self->mFromSearch);
self->sendClassifiedClickMessage("teleport");
}
}
@ -893,7 +896,7 @@ void LLPanelClassified::onClickMap(void* data)
gFloaterWorldMap->trackLocation(self->mPosGlobal);
LLFloaterWorldMap::show(NULL, TRUE);
sendClassifiedClickMessage(self->mClassifiedID, "map", self->mFromSearch);
self->sendClassifiedClickMessage("map");
}
// static
@ -901,7 +904,7 @@ void LLPanelClassified::onClickProfile(void* data)
{
LLPanelClassified* self = (LLPanelClassified*)data;
LLFloaterAvatarInfo::showFromDirectory(self->mCreatorID);
sendClassifiedClickMessage(self->mClassifiedID, "profile", self->mFromSearch);
self->sendClassifiedClickMessage("profile");
}
// static
@ -975,35 +978,21 @@ void LLPanelClassified::onFocusReceived(LLFocusableElement* ctrl, void* data)
}
// static
void LLPanelClassified::sendClassifiedClickMessage(const LLUUID& classified_id,
const char* type,
bool from_search)
void LLPanelClassified::sendClassifiedClickMessage(const char* type)
{
// You're allowed to click on your own ads to reassure yourself
// that the system is working.
std::vector<std::string> strings;
strings.push_back(classified_id.asString());
strings.push_back(type);
LLUUID no_invoice;
// New classified click-through handling
LLSD body;
body["type"] = type;
body["from_search"] = from_search;
body["classified_id"] = classified_id;
std::string url = gAgent.getRegion()->getCapability("SearchStatTracking");
body["from_search"] = mFromSearch;
body["classified_id"] = mClassifiedID;
body["parcel_id"] = mParcelID;
body["dest_pos_global"] = mPosGlobal.getValue();
body["region_name"] = mSimName;
// If the capability exists send to the new database, otherwise send to the old one.
if (!url.empty())
{
llinfos << "LLPanelClassified::sendClassifiedClickMessage via capability" << llendl;
LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
}
else
{
send_generic_message("classifiedclick", strings, no_invoice);
}
std::string url = gAgent.getRegion()->getCapability("SearchStatTracking");
llinfos << "LLPanelClassified::sendClassifiedClickMessage via capability" << llendl;
LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
}
////////////////////////////////////////////////////////////////////////////////////////////

4
indra/newview/llpanelclassified.h
View File

@ -101,7 +101,7 @@ public:
static void callbackGotPriceForListing(S32 option, LLString text, void* data);
static void callbackConfirmPublish(S32 option, void* data);
static void sendClassifiedClickMessage(const LLUUID& classified_id, const char* type, bool from_search);
void sendClassifiedClickMessage(const char* type);
protected:
static void saveCallback(S32 option, void* data);
@ -119,7 +119,7 @@ protected:
protected:
BOOL mInFinder;
bool mFromSearch;
bool mFromSearch; // from web-based "All" search sidebar
BOOL mDirty;
bool mForceClose;
bool mLocationChanged;