Merge branch 'CMR-825' into 2.x

Resolves https://jira.slub-dresden.de/browse/CMR-825

Classes/Controller/GetFileController.php

@@ -36,9 +36,9 @@
  *
  * 4. DataCite from Kitodo.Publication (this extension)
  *
- * @author    Alexander Bigga <[email protected]>
- * @author    Ralf Claussnitzer <[email protected]>
- * @author    Florian Rügamer <[email protected]>
+ * @author Alexander Bigga <[email protected]>
+ * @author Ralf Claussnitzer <[email protected]>
+ * @author Florian Rügamer <[email protected]>
  */
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -144,13 +144,13 @@ public function attachmentAction()
 
                 $qid = $piVars['qid'];
                 $source = explode(':', $qid);
-                if($source[0] == 'qucosa') {
+                if ($source[0] == 'qucosa') {
 
-                    $path = rtrim('http://' . $fedoraHost,"/").'/fedora/objects/'.$piVars['qid'].'/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
+                    $path = rtrim('http://' . $fedoraHost, "/").'/fedora/objects/'.$piVars['qid'].'/methods/qucosa:SDef/getMETSDissemination?supplement=yes';
                     $metsXml = str_replace('&', '&amp;', file_get_contents($path));
                     $dataCiteXml = \EWW\Dpf\Helper\DataCiteXml::convertFromMetsXml($metsXml);
 
-                } elseif($document = $this->documentRepository->findByUid($piVars['qid'])) {
+                } elseif ($document = $this->documentRepository->findByUid($piVars['qid'])) {
 
                     $metsXml = str_replace('&', '&amp;', $this->buildMetsXml($document));
                     $dataCiteXml = \EWW\Dpf\Helper\DataCiteXml::convertFromMetsXml($metsXml);
@@ -173,8 +173,8 @@ public function attachmentAction()
 
             case 'zip':
                 // FIXME Service locations on Fedora host are hard coded
-                $metsUrl = rtrim('http://' . $fedoraHost,"/") . '/mets?pid=' . $piVars['qid'];
-                $path = rtrim('http://' . $fedoraHost,"/") . '/zip?metsurl=' . rawurlencode($metsUrl);
+                $metsUrl = rtrim('http://' . $fedoraHost, "/") . '/mets?pid=' . $piVars['qid'];
+                $path = rtrim('http://' . $fedoraHost, "/") . '/zip?xmdpfilter=true&metsurl=' . rawurlencode($metsUrl);
                 break;
 
             default: