Merge pull request #5 from sualko/master

Catch StatisticsNotAvailableException (fix #4)
Flowpack · Jun 29, 2016 · b17d43c · b17d43c
2 parents 7a65527 + a101c30
commit b17d43c
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/Classes/Portachtzig/Neos/Piwik/Service/Reporting.php b/Classes/Portachtzig/Neos/Piwik/Service/Reporting.php
@@ -96,9 +96,16 @@ public function getNodeStatistics($node = NULL, $controllerContext = NULL, $argu
                     $params .= '&' . $key . '=' . rawurlencode($value);
                 }
             }
+
+            try {
+               $pageUrl = urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+            }
+            catch(StatisticsNotAvailableException $err) {
+               return;
+            }
 
             $apiCallUrl = $this->settings['protocol'] . '://' . $this->settings['host'] . '/index.php?module=API&format=json' . $params;
-            $apiCallUrl .= '&pageUrl=' . urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+            $apiCallUrl .= '&pageUrl=' . $pageUrl;
             $apiCallUrl .= '&idSite=' . $this->settings['idSite'] . '&token_auth=' . $this->settings['token_auth'];
             $this->browser->setRequestEngine($this->browserRequestEngine);
 
@@ -113,25 +120,25 @@ public function getNodeStatistics($node = NULL, $controllerContext = NULL, $argu
                 return new ColumnDataResult($response);
             }
             if ($arguments['type'] == 'device') {
-                $apiCallUrl .= '&segment=pageUrl==' . urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+                $apiCallUrl .= '&segment=pageUrl==' . $pageUrl;
                 $response = $this->browser->request($apiCallUrl);
 
                 return new DeviceDataResult($response);
             }
             if ($arguments['type'] == 'osFamilies') {
-                $apiCallUrl .= '&segment=pageUrl==' . urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+                $apiCallUrl .= '&segment=pageUrl==' . $pageUrl;
                 $response = $this->browser->request($apiCallUrl);
 
                 return new OperatingSystemDataResult($response);
             }
             if ($arguments['type'] == 'browsers') {
-                $apiCallUrl .= '&segment=pageUrl==' . urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+                $apiCallUrl .= '&segment=pageUrl==' . $pageUrl;
                 $response = $this->browser->request($apiCallUrl);
 
                 return new BrowserDataResult($response);
             }
             if ($arguments['type'] == 'outlinks') {
-                $apiCallUrl .= '&segment=pageUrl==' . urlencode($this->getLiveNodeUri($node, $controllerContext)->__toString());
+                $apiCallUrl .= '&segment=pageUrl==' . $pageUrl;
                 $response = $this->browser->request($apiCallUrl);
 
                 return new OutlinkDataResult($response);
@@ -161,4 +168,4 @@ protected function getLiveNodeUri(NodeInterface $node, ControllerContext $contro
 
         return $nodeUri;
     }
-}
+}