Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/regex #353

Merged
merged 6 commits into from
Nov 11, 2019
Merged

Feature/regex #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f44e14
Changes for Hashed Key and parseAdSlot logic
pm-shashank-jain Sep 19, 2019
e3e15cd
Merge branch 'optimizednightly' of https://github.com/PubMatic-OpenWr…
pm-shashank-jain Sep 24, 2019
adfba3f
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 1, 2019
fc05a81
Merge branch 'staged_nightly' of https://github.com/PubMatic-OpenWrap…
pm-shashank-jain Oct 1, 2019
1c869fc
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 24, 2019
3147979
Handle regex pattern in logger for Hybrid Implementation
pm-shashank-jain Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["pubmaticBidAdapter","appnexusBidAdapter","userId","pubCommonId","identityLinkIdSystem","digiTrustIdSystem","id5IdSystem","customIdSystem","unifiedIdSystem"]
["pubmaticBidAdapter","pubmaticServerBidAdapter","appnexusBidAdapter","userId","pubCommonId","identityLinkIdSystem","digiTrustIdSystem","id5IdSystem","customIdSystem","unifiedIdSystem"]
4 changes: 2 additions & 2 deletions modules/pubmaticBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function _parseAdSlot(bid) {
bid.params.adUnit = splits[0];
if (splits.length > 1) {
// i.e size is specified in adslot, so consider that and ignore sizes array
splits = splits[1].split('x');
splits = splits.length == 2 ? splits[1].split('x') : splits.length == 3 ? splits[2].split('x') : [];
if (splits.length != 2) {
utils.logWarn(LOG_WARN_PREFIX + 'AdSlot Error: adSlot not in required format');
return;
Expand Down Expand Up @@ -520,7 +520,7 @@ function _createImpressionObject(bid, conf) {

impObj = {
id: bid.bidId,
tagid: bid.params.adUnit || undefined,
tagid: bid.params.hashedKey || bid.params.adUnit || undefined,
bidfloor: _parseSlotParam('kadfloor', bid.params.kadfloor),
secure: 1,
ext: {
Expand Down
7 changes: 5 additions & 2 deletions modules/pubmaticServerBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,8 @@ export const spec = {
ad: firstSummary ? bid.adm : '',
cpm: (parseFloat(summary.bid) || 0).toFixed(2),
serverSideResponseTime: partnerResponseTimeObj[summary.bidder] || 0,
mi: miObj.hasOwnProperty(summary.bidder) ? miObj[summary.bidder] : UNDEFINED
mi: miObj.hasOwnProperty(summary.bidder) ? miObj[summary.bidder] : UNDEFINED,
regexPattern: summary.regex || undefined
}
break;
default:
Expand Down Expand Up @@ -434,7 +435,9 @@ export const spec = {
- setting serverSideResponseTime as -1, in cases where errorCode is 1,2 or 6. In these cases we do not log this bid in logger
- explicitly setting serverSideResponseTime = 0, where errorCode is 5, i.e. PARTNER_TIMEDOUT_ERROR
*/
mi: miObj.hasOwnProperty(summary.bidder) ? miObj[summary.bidder] : undefined
mi: miObj.hasOwnProperty(summary.bidder) ? miObj[summary.bidder] : undefined,
regexPattern: summary.regex || undefined

}
}
});
Expand Down