Add option to map API tracking parameter to custom variable in log importer script. Includes change to ImportLogs system test and fix for import log custom variable handling (old behavior was to not set multiple custom variables if they were set already instead of simply adding custom variables).

1 files changed, 11 insertions, 1 deletions

diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 5dbeb1e85c..853020e2e1 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -32,6 +32,7 @@ class ManySitesImportedLogs extends Fixture
     public $includeCloudfront = false;
     public $includeCloudfrontRtmp = false;
     public $includeNginxJson = false;
+    public $includeApiCustomVarMapping = false;
 
     public static function createAccessInstance()
     {
@@ -136,6 +137,10 @@ class ManySitesImportedLogs extends Fixture
         if ($this->includeNginxJson) {
             $this->logNginxJsonLog();
         }
+
+        if ($this->includeApiCustomVarMapping) {
+            $this->logIisWithCustomFormat($mapToCustom = true);
+        }
     }
 
     private function setupSegments()
@@ -255,7 +260,7 @@ class ManySitesImportedLogs extends Fixture
         self::executeLogImporter($logFile, $opts);
     }
 
-    private function logIisWithCustomFormat()
+    private function logIisWithCustomFormat($mapToCustom = false)
     {
         $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log';
 
@@ -265,6 +270,11 @@ class ManySitesImportedLogs extends Fixture
                       '--enable-http-errors'        => false,
                       '--enable-http-redirects'     => false);
 
+        if ($mapToCustom) {
+            $opts['--api-arg-to-visit-cvar'] = 'uid=User Name';
+            $opts['--api-arg-to-page-cvar'] = 'gt_ms=Generation Time';
+        }
+
         self::executeLogImporter($logFile, $opts);
     }