Merge pull request #76 from kitodo/fix-75

Fix #75 - require static_info_tables and avoid exception if sys_language is missing
kitodo · Feb 23, 2018 · 0376746 · 0376746
2 parents 8356dee + c081518
commit 0376746
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/Classes/Controller/ClientController.php b/Classes/Controller/ClientController.php
@@ -226,25 +226,27 @@ protected function addBaseInputOptionLists($storagePid)
 
         // create input option for all other languages
         $installedlanguages = $this->sysLanguageRepository->findInstalledLanguages();
-        foreach ($installedlanguages as $installedLanguage) {
-            $langIsoCode = $installedLanguage->getLangIsocode();
-            if (!empty($langIsoCode)) {
-                // only when an iso code has been configured, a translation dataset is created
-                if ($inputOptionTranslator->hasTranslation($langIsoCode)) {
-                    // only when a translation exists, a translation dataset is created
-                    $valueLabelList = $inputOptionTranslator->translate($iso6392b->getValues(), $langIsoCode);
-                    $displayName    = $inputOptionTranslator->translate(array('languageList'), $langIsoCode);
-
-                    $translatedOptionList = $this->objectManager->get('EWW\\Dpf\\Domain\\Model\\InputOptionList');
-                    $translatedOptionList->setDisplayName(implode('', $displayName));
-                    $translatedOptionList->setPid($storagePid);
-                    $translatedOptionList->setSysLanguageUid($installedLanguage->getUid());
-                    $translatedOptionList->setL10nParent($languageOptionList->getUid());
-                    $translatedOptionList->setValueLabelList(implode('|', $valueLabelList));
-                    $this->inputOptionListRepository->add($translatedOptionList);
+        if (is_array($installedlanguages)) {
+            foreach ($installedlanguages as $installedLanguage) {
+                $langIsoCode = $installedLanguage->getLangIsocode();
+                if (!empty($langIsoCode)) {
+                    // only when an iso code has been configured, a translation dataset is created
+                    if ($inputOptionTranslator->hasTranslation($langIsoCode)) {
+                        // only when a translation exists, a translation dataset is created
+                        $valueLabelList = $inputOptionTranslator->translate($iso6392b->getValues(), $langIsoCode);
+                        $displayName    = $inputOptionTranslator->translate(array('languageList'), $langIsoCode);
+
+                        $translatedOptionList = $this->objectManager->get('EWW\\Dpf\\Domain\\Model\\InputOptionList');
+                        $translatedOptionList->setDisplayName(implode('', $displayName));
+                        $translatedOptionList->setPid($storagePid);
+                        $translatedOptionList->setSysLanguageUid($installedLanguage->getUid());
+                        $translatedOptionList->setL10nParent($languageOptionList->getUid());
+                        $translatedOptionList->setValueLabelList(implode('|', $valueLabelList));
+                        $this->inputOptionListRepository->add($translatedOptionList);
+
+                    }
 
                 }
-
             }
         }
 

diff --git a/Classes/Domain/Repository/SysLanguageRepository.php b/Classes/Domain/Repository/SysLanguageRepository.php
@@ -28,12 +28,11 @@ class SysLanguageRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
     public function findInstalledLanguages()
     {
         $result = $this->createQuery();
-        $result->getQuerySettings()->setRespectStoragePage(false);
-        $result->getQuerySettings()->setReturnRawQueryResult(true);
+        $result->getQuerySettings()->setRespectStoragePage(FALSE);
         $result->statement('SELECT l.uid,l.pid,l.title,l.flag,i.lg_iso_2 FROM sys_language as l LEFT JOIN static_languages as i ON i.uid = l.static_lang_isocode');
 
-        if ($result->execute()) {
-            foreach ($result->execute() as $language) {
+        if ($result->execute(TRUE)) {
+            foreach ($result->execute(TRUE) as $language) {
                 $sysLanguage = new \EWW\Dpf\Domain\Model\SysLanguage();
                 $sysLanguage->setUid($language['uid']);
                 $sysLanguage->setPid($language['pid']);
@@ -46,7 +45,7 @@ public function findInstalledLanguages()
             return $sysLanguages;
         }
 
-        return null;
+        return NULL;
     }
 
 }
diff --git a/Classes/Helper/InputOption/Translator.php b/Classes/Helper/InputOption/Translator.php
@@ -65,13 +65,15 @@ public function init($inputOptionClass)
         }
 
         // load translation data for all other languages
-        foreach ($languages as $language) {
-            $langIsoCode = $language->getLangIsocode();
-
-            if (!empty($langIsoCode)) {
-                $local = \EWW\Dpf\Helper\InputOption\Locallang::load($inputOptionClass, $langIsoCode);
-                if ($local) {
-                    $this->locallang[$language->getLangIsocode()] = $local;
+        if (is_array($languages)) {
+            foreach ($languages as $language) {
+                $langIsoCode = $language->getLangIsocode();
+
+                if (!empty($langIsoCode)) {
+                    $local = \EWW\Dpf\Helper\InputOption\Locallang::load($inputOptionClass, $langIsoCode);
+                    if ($local) {
+                        $this->locallang[$language->getLangIsocode()] = $local;
+                    }
                 }
             }
         }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -37,6 +37,7 @@
     'constraints'      => array(
         'depends'   => array(
             'typo3' => '6.2.0-6.2.99',
+            'static_info_tables' => '6.3.0'
         ),
         'conflicts' => array(
         ),