Merge branch 'master' of github.com:erebusnz/gapi-google-analytics-ph…

…p-interface
erebusnz · May 31, 2015 · 247efdf · 247efdf
2 parents e9fa738 + 3ae92e1
commit 247efdf
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/gapi.class.php b/gapi.class.php
@@ -302,31 +302,31 @@ protected function reportObjectMapper($json_string) {
     }
 
     //Load result entries
-
-    foreach($json['rows'] as $row) {
-      $metrics = array();
-      $dimensions = array();
-      foreach($json['columnHeaders'] as $index => $header) {
-        switch($header['columnType']) {
-          case 'METRIC':
-            $metric_value = $row[$index];
-
-            //Check for float, or value with scientific notation
-            if(preg_match('/^(\d+\.\d+)|(\d+E\d+)|(\d+.\d+E\d+)$/',$metric_value)) {
-              $metrics[str_replace('ga:', '', $header['name'])] = floatval($metric_value);
-            } else {
-              $metrics[str_replace('ga:', '', $header['name'])] = intval($metric_value);
-            }
-            break;
-          case 'DIMENSION':
-            $dimensions[str_replace('ga:', '', $header['name'])] = strval($row[$index]);
-            break;
-          default:
-            throw new Exception("GAPI: Unrecognized columnType '{$header['columnType']}' for columnHeader '{$header['name']}'");
+    if(isset($json['rows'])){
+      foreach($json['rows'] as $row) {
+        $metrics = array();
+        $dimensions = array();
+        foreach($json['columnHeaders'] as $index => $header) {
+          switch($header['columnType']) {
+            case 'METRIC':
+              $metric_value = $row[$index];
+
+              //Check for float, or value with scientific notation
+              if(preg_match('/^(\d+\.\d+)|(\d+E\d+)|(\d+.\d+E\d+)$/',$metric_value)) {
+                $metrics[str_replace('ga:', '', $header['name'])] = floatval($metric_value);
+              } else {
+                $metrics[str_replace('ga:', '', $header['name'])] = intval($metric_value);
+              }
+              break;
+            case 'DIMENSION':
+              $dimensions[str_replace('ga:', '', $header['name'])] = strval($row[$index]);
+              break;
+            default:
+              throw new Exception("GAPI: Unrecognized columnType '{$header['columnType']}' for columnHeader '{$header['name']}'");
+          }
         }
+        $results[] = new gapiReportEntry($metrics, $dimensions);
       }
-
-      $results[] = new gapiReportEntry($metrics, $dimensions);
     }
 
     $this->report_root_parameters = $report_root_parameters;