Merge branch 'master' of github.com:piwik/piwik

misc/log-analytics/import_logs.py

@@ -1294,13 +1294,16 @@ class Recorder(object):
             else:
                 args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
 
+        args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
         if hit.is_error or hit.is_redirect:
-            args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
-            args['action_name'] = '%s/URL = %s%s' % (
-                hit.status,
-                urllib.quote(args['url'], ''),
-                ("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != ''  else '')
-            )
+			args['action_name'] = '%s/URL = %s%s' % (
+				hit.status,
+				urllib.quote(args['url'], ''),
+				("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != ''  else '')
+			)
+        else:
+			args['action_name'] = urllib.quote(args['url'], '')
+
         if hit.generation_time_milli > 0:
             args['gt_ms'] = hit.generation_time_milli
         return args