kitodo / kitodo-presentation

Classes/Common/DocumentList.php

Spacing +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
                     $fields = Solr::getFields();
                     $params = [];
                     // Restrict the fields to the required ones
-                    $params['fields'] = $fields['uid'] . ',' . $fields['id'] .',' . $fields['toplevel'] . ',' . $fields['thumbnail'] . ',' . $fields['page'];
+                    $params['fields'] = $fields['uid'] . ',' . $fields['id'] . ',' . $fields['toplevel'] . ',' . $fields['thumbnail'] . ',' . $fields['page'];
                     foreach ($this->solrConfig as $solr_name) {
                         $params['fields'] .= ',' . $solr_name;
                     }

Classes/Common/SolrSearchResult/Region.php

Braces +22 added lines, -11 removed lines

@@ -20,7 +20,8 @@ 
  * @subpackage dlf
  * @access public
  */
-class Region {
+class Region
+{
 
     /**
      * The identifier of the region
@@ -104,7 +105,8 @@ 
      *
      * @return void
      */
-    public function __construct($id, $region) {
+    public function __construct($id, $region)
+    {
         $this->id = $id;
         $this->pageId = $region['pageIdx'];
         $this->xBeginPosition = $region['ulx'];
@@ -123,7 +125,8 @@ 
      *
      * @return int The region's identifier
      */
-    public function getId() {
+    public function getId()
+    {
         return $this->id;
     }
 
@@ -134,7 +137,8 @@ 
      *
      * @return int The region's page identifier
      */
-    public function getPageId() {
+    public function getPageId()
+    {
         return $this->pageId;
     }
 
@@ -145,7 +149,8 @@ 
      *
      * @return int The region's horizontal beginning position
      */
-    public function getXBeginPosition() {
+    public function getXBeginPosition()
+    {
         return $this->xBeginPosition;
     }
 
@@ -156,7 +161,8 @@ 
      *
      * @return int The region's horizontal ending position
      */
-    public function getXEndPosition() {
+    public function getXEndPosition()
+    {
         return $this->xEndPosition;
     }
 
@@ -167,7 +173,8 @@ 
      *
      * @return int The region's vertical beginning position
      */
-    public function getYBeginPosition() {
+    public function getYBeginPosition()
+    {
         return $this->yBeginPosition;
     }
 
@@ -178,7 +185,8 @@ 
      *
      * @return int The region's vertical ending position
      */
-    public function getYEndPosition() {
+    public function getYEndPosition()
+    {
         return $this->yEndPosition;
     }
 
@@ -189,7 +197,8 @@ 
      *
      * @return int The region's width
      */
-    public function getWidth() {
+    public function getWidth()
+    {
         return $this->width;
     }
 
@@ -200,7 +209,8 @@ 
      *
      * @return int The region's height
      */
-    public function getHeight() {
+    public function getHeight()
+    {
         return $this->height;
     }
 
@@ -211,7 +221,8 @@ 
      *
      * @return string The region's text
      */
-    public function getText() {
+    public function getText()
+    {
         return $this->text;
     }
 }

Classes/Common/SolrSearchResult/Highlight.php

Braces +18 added lines, -9 removed lines

@@ -20,7 +20,8 @@ 
  * @subpackage dlf
  * @access public
  */
-class Highlight {
+class Highlight
+{
 
     /**
      * The identifier in form 'w_h_x_y'
@@ -95,7 +96,8 @@ 
      *
      * @return void
      */
-    public function __construct($highlight) {
+    public function __construct($highlight)
+    {
         $this->parentRegionId = $highlight['parentRegionIdx'];
         $this->xBeginPosition = $highlight['ulx'];
         $this->xEndPosition = $highlight['lrx'];
@@ -113,7 +115,8 @@ 
      *
      * @return string The highlight's identifier
      */
-    public function getId() {
+    public function getId()
+    {
         return $this->id;
     }
 
@@ -124,7 +127,8 @@ 
      *
      * @return int The highlight's horizontal beginning position
      */
-    public function getXBeginPosition() {
+    public function getXBeginPosition()
+    {
         return $this->xBeginPosition;
     }
 
@@ -135,7 +139,8 @@ 
      *
      * @return int The highlight's horizontal ending position
      */
-    public function getXEndPosition() {
+    public function getXEndPosition()
+    {
         return $this->xEndPosition;
     }
 
@@ -146,7 +151,8 @@ 
      *
      * @return int The highlight's vertical beginning position
      */
-    public function getYBeginPosition() {
+    public function getYBeginPosition()
+    {
         return $this->yBeginPosition;
     }
 
@@ -157,7 +163,8 @@ 
      *
      * @return int The highlight's vertical ending position
      */
-    public function getYEndPosition() {
+    public function getYEndPosition()
+    {
         return $this->yEndPosition;
     }
 
@@ -168,7 +175,8 @@ 
      *
      * @return int The highlight's width
      */
-    public function getWidth() {
+    public function getWidth()
+    {
         return $this->width;
     }
 
@@ -179,7 +187,8 @@ 
      *
      * @return int The highlight's height
      */
-    public function getHeight() {
+    public function getHeight()
+    {
         return $this->height;
     }
 }

Classes/Common/SolrSearchResult/Page.php

Braces +12 added lines, -6 removed lines

@@ -20,7 +20,8 @@ 
  * @subpackage dlf
  * @access public
  */
-class Page {
+class Page
+{
 
     /**
      * The identifier of the page
@@ -64,7 +65,8 @@ 
      *
      * @return void
      */
-    public function __construct($id, $page) {
+    public function __construct($id, $page)
+    {
         $this->id = $id;
         $this->name = $page['id'];
         $this->width = $page['width'];
@@ -78,7 +80,8 @@ 
      *
      * @return int The page's identifier
      */
-    public function getId() {
+    public function getId()
+    {
         return $this->id;
     }
 
@@ -89,7 +92,8 @@ 
      *
      * @return string The page's name
      */
-    public function getName() {
+    public function getName()
+    {
         return $this->name;
     }
 
@@ -100,7 +104,8 @@ 
      *
      * @return int The page's width
      */
-    public function getWidth() {
+    public function getWidth()
+    {
         return $this->width;
     }
 
@@ -111,7 +116,8 @@ 
      *
      * @return int The page's height
      */
-    public function getHeight() {
+    public function getHeight()
+    {
         return $this->height;
     }
 }

Classes/Common/Solr.php

Braces +2 added lines, -1 removed lines

@@ -247,7 +247,8 @@
      *
      * @return array fields
      */
-    public static function getFields() {
+    public static function getFields()
+    {
         $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
         $fields = [];

Classes/Plugin/Tools/SearchInDocumentTool.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
             '###LABEL_HIGHLIGHT_WORD###' => $this->conf['highlightWordInputName'],
             '###LABEL_ENCRYPTED###' => $this->conf['encryptedInputName'],
             '###CURRENT_DOCUMENT###' => $this->getCurrentDocumentId(),
-            '###SOLR_ENCRYPTED###' => $this->getEncryptedCoreName() ?: '',
+            '###SOLR_ENCRYPTED###' => $this->getEncryptedCoreName() ? : '',
         ];
 
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);

Classes/Common/SolrSearchResult/ResultDocument.php

Braces +30 added lines, -15 removed lines

@@ -24,7 +24,8 @@ 
  * @subpackage dlf
  * @access public
  */
-class ResultDocument {
+class ResultDocument
+{
 
     /**
      * The identifier
@@ -101,7 +102,8 @@ 
      *
      * @return void
      */
-    public function __construct($record, $highlighting, $fields) {
+    public function __construct($record, $highlighting, $fields)
+    {
         $this->id = $record[$fields['id']];
         $this->uid = $record[$fields['uid']];
         $this->page = $record[$fields['page']];
@@ -122,7 +124,8 @@ 
      *
      * @return string The result's record identifier
      */
-    public function getId() {
+    public function getId()
+    {
         return $this->id;
     }
 
@@ -133,7 +136,8 @@ 
      *
      * @return string|null The result's record unified identifier
      */
-    public function getUid() {
+    public function getUid()
+    {
         return $this->uid;
     }
 
@@ -144,7 +148,8 @@ 
      *
      * @return int The result's record page
      */
-    public function getPage() {
+    public function getPage()
+    {
         return $this->page;
     }
 
@@ -155,7 +160,8 @@ 
      *
      * @return string All result's record snippets imploded to one string
      */
-    public function getSnippets() {
+    public function getSnippets()
+    {
         return $this->snippets;
     }
 
@@ -166,7 +172,8 @@ 
      *
      * @return array(Page) All result's pages which contain search phrase
      */
-    public function getPages() {
+    public function getPages()
+    {
         return $this->pages;
     }
 
@@ -177,7 +184,8 @@ 
      *
      * @return array(Region) All result's regions which contain search phrase
      */
-    public function getRegions() {
+    public function getRegions()
+    {
         return $this->regions;
     }
 
@@ -188,7 +196,8 @@ 
      *
      * @return array(Highlight) All result's highlights of search phrase
      */
-    public function getHighlights() {
+    public function getHighlights()
+    {
         return $this->highlights;
     }
 
@@ -199,7 +208,8 @@ 
      *
      * @return array(string) All result's highlights of search phrase
      */
-    public function getHighlightsIds() {
+    public function getHighlightsIds()
+    {
         $highlightsIds = [];
         foreach ($this->highlights as $highlight) {
             array_push($highlightsIds, $highlight->getId());
@@ -215,7 +225,8 @@ 
      *
      * @return void
      */
-    private function parseSnippets() {
+    private function parseSnippets()
+    {
         $snippetArray = $this->getArrayByIndex('text');
 
         $this->snippets = !empty($snippetArray) ? implode(' [...] ', $snippetArray) : '';
@@ -229,7 +240,8 @@ 
      *
      * @return void
      */
-    private function parsePages() {
+    private function parsePages()
+    {
         $pageArray = $this->getArrayByIndex('pages');
 
         $i = 0;
@@ -249,7 +261,8 @@ 
      *
      * @return void
      */
-    private function parseRegions() {
+    private function parseRegions()
+    {
         $regionArray = $this->getArrayByIndex('regions');
 
         $i = 0;
@@ -269,7 +282,8 @@ 
      *
      * @return void
      */
-    private function parseHighlights() {
+    private function parseHighlights()
+    {
         $highlightArray = $this->getArrayByIndex('highlights');
 
         foreach ($highlightArray as $highlights) {
@@ -290,7 +304,8 @@ 
      *
      * @return array
      */
-    private function getArrayByIndex($index) {
+    private function getArrayByIndex($index)
+    {
         $objectArray = [];
         foreach ($this->snippetsForRecord as $snippet) {
             array_push($objectArray, $snippet[$index]);

Classes/Plugin/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -107,6 +107,6 @@
     }
 
     private function getUid($uid) {
-        return is_numeric($uid) > 0  ? intval($uid) : $uid;
+        return is_numeric($uid) > 0 ? intval($uid) : $uid;
     }
 }

Braces +4 added lines, -2 removed lines

@@ -102,11 +102,13 @@
         return $response;
     }
 
-    private function getQuery($fields, $parameters) {
+    private function getQuery($fields, $parameters)
+    {
         return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
     }
 
-    private function getUid($uid) {
+    private function getUid($uid)
+    {
         return is_numeric($uid) > 0  ? intval($uid) : $uid;
     }
 }

Classes/Plugin/Search.php

Spacing +6 added lines, -6 removed lines

@@ -462,12 +462,12 @@
                 ) {
                     // Search in document and all subordinates (valid for up to three levels of hierarchy).
                     $params['filterquery'][]['query'] = '_query_:"{!join from='
-                        . $fields['uid'] .' to=' . $fields['partof'] .'}'
-                        . $fields['uid'] .':{!join from=' . $fields['uid'] .' to=' . $fields['partof'] .'}'
-                        . $fields['uid'] .':' . $this->piVars['id'] . '"' . ' OR {!join from='
-                        . $fields['uid'] .' to=' . $fields['partof'] .'}'
-                        . $fields['uid'] .':' . $this->piVars['id'] . ' OR '
-                        . $fields['uid'] .':' . $this->piVars['id'];
+                        . $fields['uid'] . ' to=' . $fields['partof'] . '}'
+                        . $fields['uid'] . ':{!join from=' . $fields['uid'] . ' to=' . $fields['partof'] . '}'
+                        . $fields['uid'] . ':' . $this->piVars['id'] . '"' . ' OR {!join from='
+                        . $fields['uid'] . ' to=' . $fields['partof'] . '}'
+                        . $fields['uid'] . ':' . $this->piVars['id'] . ' OR '
+                        . $fields['uid'] . ':' . $this->piVars['id'];
                     $label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), Document::getTitle($this->piVars['id'])));
                 }
             }