kitodo / kitodo-presentation

Classes/Format/Alto.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Alto implements \Kitodo\Dlf\Common\FulltextInterface
-{
+class Alto implements \Kitodo\Dlf\Common\FulltextInterface {
     /**
      * This extracts the fulltext data from ALTO XML
      *
@@ -31,8 +30,7 @@ 
      *
      * @return string The raw unformatted fulltext
      */
-    public function getRawText(\SimpleXMLElement $xml)
-    {
+    public function getRawText(\SimpleXMLElement $xml) {
         $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
         // Get all (presumed) words of the text.
         $words = $xml->xpath('./alto:Layout/alto:Page/alto:PrintSpace//alto:TextBlock/alto:TextLine/alto:String/@CONTENT');

Classes/Command/IndexCommand.php

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
             $startingPoint = MathUtility::forceIntegerInRange((int) $input->getOption('pid'), 0);
         }
         if ($startingPoint == 0) {
-            $io->error('ERROR: No valid PID (' . $startingPoint . ') given.');
+            $io->error('ERROR: No valid PID ('.$startingPoint.') given.');
             exit(1);
         }
 
@@ -99,13 +99,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $output_solrCores = [];
                 foreach ($allSolrCores as $index_name => $uid) {
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
+                    $output_solrCores[] = $uid.' : '.$index_name;
                 }
                 if (empty($output_solrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $startingPoint . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$startingPoint.".\n");
                     exit(1);
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
                     exit(1);
                 }
             }
@@ -118,7 +118,7 @@ 
             !MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))
             && !GeneralUtility::isValidUrl($input->getOption('doc'))
         ) {
-            $io->error('ERROR: "' . $input->getOption('doc') . '" is not a valid document UID or URL for --doc|-d.');
+            $io->error('ERROR: "'.$input->getOption('doc').'" is not a valid document UID or URL for --doc|-d.');
             exit(1);
         }
 
@@ -126,19 +126,19 @@ 
         $doc = Document::getInstance($input->getOption('doc'), $startingPoint, TRUE);
         if ($doc->ready) {
             if ($dryRun) {
-                $io->section('DRY RUN: Would index ' . $doc->uid . ' ("' . $doc->location . '") on UID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                $io->section('DRY RUN: Would index '.$doc->uid.' ("'.$doc->location.'") on UID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
             } else {
                 if ($io->isVerbose()) {
-                    $io->section('Indexing ' . $doc->uid . ' ("' . $doc->location . '") on UID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                    $io->section('Indexing '.$doc->uid.' ("'.$doc->location.'") on UID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                 }
                 // ...and save it to the database...
                 if (!$doc->save($startingPoint, $solrCoreUid)) {
-                    $io->error('ERROR: Document "' . $input->getOption('doc') . '" not saved and indexed.');
+                    $io->error('ERROR: Document "'.$input->getOption('doc').'" not saved and indexed.');
                     exit(1);
                 }
             }
         } else {
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
             exit(1);
         }
 

Braces +3 added lines, -6 removed lines

@@ -26,13 +26,11 @@ 
 /**
  * Index single document into database and Solr.
  */
-class IndexCommand extends Command
-{
+class IndexCommand extends Command {
     /**
      * Configure the command by defining the name, options and arguments
      */
-    public function configure()
-    {
+    public function configure() {
         $this
             ->setDescription('Index single document into database and Solr.')
             ->setHelp('')
@@ -68,8 +66,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 

Classes/Command/ReindexCommand.php

Spacing +9 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
             $startingPoint = MathUtility::forceIntegerInRange((int) $input->getOption('pid'), 0);
         }
         if ($startingPoint == 0) {
-            $io->error('ERROR: No valid PID (' . $startingPoint . ') given.');
+            $io->error('ERROR: No valid PID ('.$startingPoint.') given.');
             exit(1);
         }
 
@@ -106,13 +106,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $output_solrCores = [];
                 foreach ($allSolrCores as $index_name => $uid) {
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
+                    $output_solrCores[] = $uid.' : '.$index_name;
                 }
                 if (empty($output_solrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $startingPoint . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$startingPoint.".\n");
                     exit(1);
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
                     exit(1);
                 }
             }
@@ -127,7 +127,7 @@ 
         } else {
             // coll may be a single integer, a list of integer
             if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE)))) {
-                $io->error('ERROR: "' . $input->getOption('coll') . '" is not a valid list of collection UIDs for --coll|-c.');
+                $io->error('ERROR: "'.$input->getOption('coll').'" is not a valid list of collection UIDs for --coll|-c.');
                 exit(1);
             }
             $documents = $this->getDocumentsToProceed($input->getOption('coll'), $startingPoint);
@@ -137,18 +137,18 @@ 
             $doc = Document::getInstance($document, $startingPoint, TRUE);
             if ($doc->ready) {
                 if ($dryRun) {
-                    $io->writeln('DRY RUN: Would index ' . $id . '/' . count($documents) . ' ' . $doc->uid . ' ("' . $doc->location . '") on UID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                    $io->writeln('DRY RUN: Would index '.$id.'/'.count($documents).' '.$doc->uid.' ("'.$doc->location.'") on UID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                 } else {
                     if ($io->isVerbose()) {
-                        $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $id . '/' . count($documents) . ' ' . $doc->uid . ' ("' . $doc->location . '") on UID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                        $io->writeln(date('Y-m-d H:i:s').' Indexing '.$id.'/'.count($documents).' '.$doc->uid.' ("'.$doc->location.'") on UID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                     }
                     // ...and save it to the database...
                     if (!$doc->save($startingPoint, $solrCoreUid)) {
-                        $io->error('ERROR: Document "' . $id . '" not saved and indexed.');
+                        $io->error('ERROR: Document "'.$id.'" not saved and indexed.');
                     }
                 }
             } else {
-                $io->error('ERROR: Document "' . $id . '" could not be loaded.');
+                $io->error('ERROR: Document "'.$id.'" could not be loaded.');
             }
             // Clear document registry to prevent memory exhaustion.
             Document::clearRegistry();

Braces +3 added lines, -6 removed lines

@@ -27,13 +27,11 @@ 
 /**
  * Reindex a collection into database and Solr.
  */
-class ReindexCommand extends Command
-{
+class ReindexCommand extends Command {
     /**
      * Configure the command by defining the name, options and arguments
      */
-    public function configure()
-    {
+    public function configure() {
         $this
             ->setDescription('Reindex a collection into database and Solr.')
             ->setHelp('')
@@ -75,8 +73,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 

class.ext_update.php

Spacing +5 added lines, -5 removed lines

@@ -215,7 +215,7 @@ 
             'TEIHDR' => 'Kitodo\\\\Dlf\\\\Format\\\\TeiHeader'
         ];
         foreach ($oldRecords as $uid => $type) {
-            $sqlQuery = 'UPDATE tx_dlf_formats SET class="' . $newValues[$type] . '" WHERE uid=' . $uid;
+            $sqlQuery = 'UPDATE tx_dlf_formats SET class="'.$newValues[$type].'" WHERE uid='.$uid;
             $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
         }
         Helper::addMessage(
@@ -242,7 +242,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
                 'tx_dlf_metadata',
-                'tx_dlf_metadata.uid IN (' . implode(',', $metadataUids) . ')'
+                'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'
                     . Helper::whereClause('tx_dlf_metadata')
             );
             while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
@@ -334,7 +334,7 @@ 
                     $solrInfo['username']
                     && $solrInfo['password']
                 ) {
-                    $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
+                    $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
                 } else {
                     $host = $solrInfo['host'];
                 }
@@ -346,7 +346,7 @@ 
                 ]);
                 // Build request for adding new Solr core.
                 // @see http://wiki.apache.org/solr/CoreAdmin
-                $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml&action=CREATE&name=' . $resArray['index_name'] . '&instanceDir=' . $resArray['index_name'] . '&dataDir=data&configSet=dlf';
+                $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name='.$resArray['index_name'].'&instanceDir='.$resArray['index_name'].'&dataDir=data&configSet=dlf';
                 $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
                 // Process response.
                 if ($response) {
@@ -381,7 +381,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'COLUMN_NAME',
             'INFORMATION_SCHEMA.COLUMNS',
-            'TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="' . $database . '" AND COLUMN_NAME="document_format"'
+            'TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="'.$database.'" AND COLUMN_NAME="document_format"'
         );
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
             if ($resArray['COLUMN_NAME'] == 'document_format') {

Braces +13 added lines, -26 removed lines

@@ -21,8 +21,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ext_update
-{
+class ext_update {
     /**
      * This holds the output ready to return
      *
@@ -38,8 +37,7 @@ 
      *
      * @return boolean Should the update option be shown?
      */
-    public function access()
-    {
+    public function access() {
         if (count($this->getMetadataConfig())) {
             return TRUE;
         } elseif ($this->oldIndexRelatedTableNames()) {
@@ -61,8 +59,7 @@ 
      *
      * @return array Array of UIDs of outdated records
      */
-    protected function getMetadataConfig()
-    {
+    protected function getMetadataConfig() {
         $uids = [];
         // check if tx_dlf_metadata.xpath exists anyhow
         $fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
@@ -92,8 +89,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main()
-    {
+    public function main() {
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/Resources/Private/Language/FlashMessages.xml');
         // Update the metadata configuration.
@@ -123,8 +119,7 @@ 
      *
      * @return array containing old format classes
      */
-    protected function oldFormatClasses()
-    {
+    protected function oldFormatClasses() {
         $oldRecords = [];
         // Get all records with outdated configuration.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -146,8 +141,7 @@ 
      *
      * @return boolean TRUE if old index related columns exist
      */
-    protected function oldIndexRelatedTableNames()
-    {
+    protected function oldIndexRelatedTableNames() {
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'column_name',
             'INFORMATION_SCHEMA.COLUMNS',
@@ -173,8 +167,7 @@ 
      *
      * @return void
      */
-    protected function renameIndexRelatedColumns()
-    {
+    protected function renameIndexRelatedColumns() {
         $sqlQuery = 'UPDATE tx_dlf_metadata'
             . ' SET `index_tokenized` = `tokenized`'
             . ', `index_stored` = `stored`'
@@ -206,8 +199,7 @@ 
      *
      * @return void
      */
-    protected function updateFormatClasses()
-    {
+    protected function updateFormatClasses() {
         $oldRecords = $this->oldFormatClasses();
         $newValues = [
             'ALTO' => 'Kitodo\\\\Dlf\\\\Format\\\\Alto', // Those are effectively single backslashes
@@ -233,8 +225,7 @@ 
      *
      * @return void
      */
-    protected function updateMetadataConfig()
-    {
+    protected function updateMetadataConfig() {
         $metadataUids = $this->getMetadataConfig();
         if (!empty($metadataUids)) {
             $data = [];
@@ -288,8 +279,7 @@ 
      *
      * @return boolean
      */
-    protected function solariumSolrUpdateRequired()
-    {
+    protected function solariumSolrUpdateRequired() {
         // Get all Solr cores that were not deleted.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'index_name',
@@ -314,8 +304,7 @@ 
      *
      * @return void
      */
-    protected function doSolariumSolrUpdate()
-    {
+    protected function doSolariumSolrUpdate() {
         // Get all Solr cores that were not deleted.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'index_name',
@@ -375,8 +364,7 @@ 
         $this->content .= Helper::renderFlashMessages();
     }
 
-    protected function hasNoFormatForDocument()
-    {
+    protected function hasNoFormatForDocument() {
         $database = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'];
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'COLUMN_NAME',
@@ -391,8 +379,7 @@ 
         return TRUE;
     }
 
-    protected function updateDocumentAddFormat()
-    {
+    protected function updateDocumentAddFormat() {
         $sqlQuery = 'ALTER TABLE tx_dlf_documents ADD COLUMN document_format varchar(100) DEFAULT "" NOT NULL;';
         $result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
         if ($result) {