From 2adadcfcce61cdcdaf97e22b18c373dcb271f4c8 Mon Sep 17 00:00:00 2001
From: Manasi <pm-manasi-moghe@users.noreply.github.com>
Date: Sat, 8 Dec 2018 05:23:10 +0530
Subject: [PATCH] Dctr fixes (#3337)

* changes to not show dctr message when none of the adunits have dctr set

* added usage description for dctr and currency params
---
 modules/pubmaticBidAdapter.js | 28 ++++++++++++++++++++++++++++
 modules/pubmaticBidAdapter.md |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index f66fd6e6f8f..bc846c39176 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -527,6 +527,7 @@ export const spec = {
     payload.site.domain = _getDomainFromURL(payload.site.page);
 
     // set dctr value in site.ext, if present in validBidRequests[0], else ignore
+<<<<<<< HEAD
     if (validBidRequests[0].params.hasOwnProperty('dctr')) {
       dctr = validBidRequests[0].params.dctr;
       if (utils.isStr(dctr) && dctr.length > 0) {
@@ -561,6 +562,33 @@ export const spec = {
         BIDDER_CODE +
           ': dctr value not found in 1st adunit, ignoring values from subsequent adunits'
       );
+=======
+    if (dctrArr.length > 0) {
+      if (validBidRequests[0].params.hasOwnProperty('dctr')) {
+        dctr = validBidRequests[0].params.dctr;
+        if (utils.isStr(dctr) && dctr.length > 0) {
+          var arr = dctr.split('|');
+          dctr = '';
+          arr.forEach(val => {
+            dctr += (val.length > 0) ? (val.trim() + '|') : '';
+          });
+          dctrLen = dctr.length;
+          if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
+            dctr = dctr.substring(0, dctrLen - 1);
+          }
+          payload.site.ext = {
+            key_val: dctr.trim()
+          }
+        } else {
+          utils.logWarn(BIDDER_CODE + ': Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
+        }
+        if (dctrArr.length > 1) {
+          utils.logWarn(BIDDER_CODE + ': dctr value found in more than 1 adunits. Value from 1st adunit will be picked. Ignoring values from subsequent adunits');
+        }
+      } else {
+        utils.logWarn(BIDDER_CODE + ': dctr value not found in 1st adunit, ignoring values from subsequent adunits');
+      }
+>>>>>>> Dctr fixes (#3337)
     }
 
     _handleEids(payload);
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index 86d59d333f0..3f28d4586e7 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -33,8 +33,8 @@ var adUnits = [
         kadpageurl: 'www.test.com',          // optional							
         gender: 'M',                         // optional
         kadfloor: '0.50',                    // optional
-        currency: 'AUD'                      // optional
-        dctr: 'key1=123|key2=345'            // optional
+        currency: 'AUD'                      // optional (Value configured only in the 1st adunit will be passed on. < br/> Values if present in subsequent adunits, will be ignored.)
+        dctr: 'key1=123|key2=345'            // optional (Value configured only in the 1st adunit will be passed on. < br/> Values if present in subsequent adunits, will be ignored.)
       }
     }]
 }];