From 72cef3f578a36093526fe4ab5cc5aa26213c2698 Mon Sep 17 00:00:00 2001 From: modality Date: Thu, 17 Apr 2014 03:24:10 -0400 Subject: [PATCH 1/2] Fix spurious check for macro in adm --- rtbkit/plugins/exchange/mopub_exchange_connector.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rtbkit/plugins/exchange/mopub_exchange_connector.cc b/rtbkit/plugins/exchange/mopub_exchange_connector.cc index cbb69edfd..568fe5e73 100644 --- a/rtbkit/plugins/exchange/mopub_exchange_connector.cc +++ b/rtbkit/plugins/exchange/mopub_exchange_connector.cc @@ -166,12 +166,11 @@ getCreativeCompatibility(const Creative & creative, } tmp.clear(); - // 4. Must have mopub.adm that includes MoPub's macro + // 4. Must have Ad Markup in HTML in mopub.adm getAttr(result, pconf, "adm", crinfo->adm, includeReasons); - if (crinfo->adm.find("${AUCTION_PRICE:BF}") == string::npos) + if (!crinfo->adm) result.setIncompatible - ("creative[].providerConfig.mopub.adm ad markup must contain " - "encrypted win price macro ${AUCTION_PRICE:BF}", + ("creative[].providerConfig.mopub.adm is null", includeReasons); // 5. Must have creative ID in mopub.crid From b4d3b12a6a27a0d46651b39ea91cbd932fe61156 Mon Sep 17 00:00:00 2001 From: modality Date: Thu, 17 Apr 2014 03:52:59 -0400 Subject: [PATCH 2/2] always build before pushing --- rtbkit/plugins/exchange/mopub_exchange_connector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtbkit/plugins/exchange/mopub_exchange_connector.cc b/rtbkit/plugins/exchange/mopub_exchange_connector.cc index 568fe5e73..9ea5f6b73 100644 --- a/rtbkit/plugins/exchange/mopub_exchange_connector.cc +++ b/rtbkit/plugins/exchange/mopub_exchange_connector.cc @@ -168,7 +168,7 @@ getCreativeCompatibility(const Creative & creative, // 4. Must have Ad Markup in HTML in mopub.adm getAttr(result, pconf, "adm", crinfo->adm, includeReasons); - if (!crinfo->adm) + if (crinfo->adm.empty()) result.setIncompatible ("creative[].providerConfig.mopub.adm is null", includeReasons);