Merge branch 'master' of https://github.com/acdh-oeaw/arche-gui

acdh-oeaw · May 4, 2023 · 18b8d66 · 18b8d66
2 parents 6c01153 + d1a5132
commit 18b8d66
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/src/Controller/DetailViewController.php b/src/Controller/DetailViewController.php
@@ -243,7 +243,7 @@ public function detailOverviewApi(string $identifier, string $lang): Response
 
         $diss = $this->generalFunctions->getDissServices($id);
 
-        if(count($result) === 0) {
+        if (count($result) === 0) {
             return new Response(\json_encode(array("There is no data")), 404, ['Content-Type' => 'application/json']);
         }
 
@@ -263,8 +263,5 @@ public function detailOverviewApi(string $identifier, string $lang): Response
 
 
         return new Response(render($build));
-
     }
-
-
 }
diff --git a/src/Controller/RootViewController.php b/src/Controller/RootViewController.php
@@ -9,7 +9,6 @@
  */
 class RootViewController extends \Drupal\acdh_repo_gui\Controller\ArcheBaseController
 {
-
     public function __construct()
     {
         parent::__construct();
@@ -37,5 +36,4 @@ public function generateView(string $order = "datedesc", string $limit = "10", s
             '#cache' => ['max-age' => 0]
         ];
     }
-
 }
diff --git a/src/Helper/DetailViewHelper.php b/src/Helper/DetailViewHelper.php
@@ -44,21 +44,20 @@ public function createView(array $data = array()): array
      * @param string $id
      * @return array
      */
-    public function overviewObj(string $id): array {
-      
+    public function overviewObj(string $id): array
+    {
         $client = new \GuzzleHttp\Client();
         try {
-          $response = $client->get(str_replace('/api/', '', $this->repoDb->getBaseUrl()).'/browser/api/overview/'.$id.'/en');
+            $response = $client->get(str_replace('/api/', '', $this->repoDb->getBaseUrl()).'/browser/api/overview/'.$id.'/en');
 
 
-          $data = json_decode($response->getBody(), TRUE);
-          $this->data = json_decode(json_encode($data));
-          $this->extendActualObj();
-          $this->detailViewObjectArray[] = new ResourceObject($this->data, $this->repoDb, $this->siteLang);
+            $data = json_decode($response->getBody(), true);
+            $this->data = json_decode(json_encode($data));
+            $this->extendActualObj();
+            $this->detailViewObjectArray[] = new ResourceObject($this->data, $this->repoDb, $this->siteLang);
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
+            return [];
         }
-        catch (\GuzzleHttp\Exception\RequestException $e) {
-          return [];
-        }
-        return $this->detailViewObjectArray; 
+        return $this->detailViewObjectArray;
     }
 }
diff --git a/src/Model/ArcheModel.php b/src/Model/ArcheModel.php
@@ -61,7 +61,6 @@ public function setSqlTimeout(string $timeout = '7000')
         } catch (\Drupal\Core\Database\DatabaseExceptionWrapper $ex) {
             \Drupal::logger('acdh_repo_gui')->notice($ex->getMessage());
         }
-
     }
 
     /**

diff --git a/src/Model/DetailViewModel.php b/src/Model/DetailViewModel.php
@@ -52,7 +52,6 @@ public function getViewData(string $identifier = ""): array
 
     public function getViewDataLib(string $identifier = ""): object
     {
-
         if (empty($identifier)) {
             return array();
         }

diff --git a/src/Model/GeneralFunctionsModel.php b/src/Model/GeneralFunctionsModel.php
@@ -54,7 +54,6 @@ private function getRepoIdBySpecialID(): array
             );
 
             $this->sqlResult = $query->fetchAll();
-
         } catch (\Exception $ex) {
             \Drupal::logger('acdh_repo_gui')->notice($ex->getMessage());
             return array();

diff --git a/src/Model/SearchViewModel.php b/src/Model/SearchViewModel.php
@@ -12,7 +12,6 @@
  */
 class SearchViewModel extends ArcheModel
 {
-
     private $sqlResult;
     private $siteLang;
     private $searchCfg;