kitodo / kitodo-presentation

common/class.tx_dlf_alto.php

Indentation +15 added lines, -15 removed lines

@@ -19,24 +19,24 @@
  */
 class tx_dlf_alto implements tx_dlf_fulltext {
 
-	/**
-	 * This extracts the fulltext data from ALTO XML
-	 *
-	 * @access	public
-	 *
-	 * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
-	 *
-	 * @return	string			The raw unformatted fulltext
-	 */
-	public static function getRawText(SimpleXMLElement $xml) {
+    /**
+     * This extracts the fulltext data from ALTO XML
+     *
+     * @access	public
+     *
+     * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
+     *
+     * @return	string			The raw unformatted fulltext
+     */
+    public static function getRawText(SimpleXMLElement $xml) {
 
-		$xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
+        $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');
+        // Get all (presumed) words of the text.
+        $words = $xml->xpath('./alto:Layout/alto:Page/alto:PrintSpace//alto:TextBlock/alto:TextLine/alto:String/@CONTENT');
 
-		return implode(' ', $words);
+        return implode(' ', $words);
 
-	}
+    }
 
 }

ext_localconf.php

Indentation +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 
 if (TYPO3_MODE === 'FE') {
 
-	/*
+    /*
 	 * docTypeCheck user function to use in Typoscript
 	 *
 	 * @access	public
@@ -88,12 +88,12 @@ 
 	 *
 	 * @return	boolean		TRUE if document type matches, FALSE if not
 	 **/
-	function user_dlf_docTypeCheck($type) {
+    function user_dlf_docTypeCheck($type) {
 
-		$hook = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_doctype');
+        $hook = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_doctype');
 
-		return ($hook->getDocType() === $type);
+        return ($hook->getDocType() === $type);
 
-	}
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-if (!defined ('TYPO3_MODE')) 	die ('Access denied.');
+if (!defined('TYPO3_MODE')) 	die ('Access denied.');
 
 // Register plugins.
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/audioplayer/class.tx_dlf_audioplayer.php', '_audioplayer', 'list_type', TRUE);

Braces +3 added lines, -1 removed lines

@@ -9,7 +9,9 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-if (!defined ('TYPO3_MODE')) 	die ('Access denied.');
+if (!defined ('TYPO3_MODE')) {
+    die ('Access denied.');
+}
 
 // Register plugins.
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/audioplayer/class.tx_dlf_audioplayer.php', '_audioplayer', 'list_type', TRUE);

cli/class.tx_dlf_cli.php

Indentation +125 added lines, -125 removed lines

@@ -11,7 +11,7 @@ 
 
 if (!defined('TYPO3_cliMode')) {
 
-	die('You cannot run this script directly!');
+    die('You cannot run this script directly!');
 
 }
 
@@ -25,208 +25,208 @@ 
  */
 class tx_dlf_cli extends \TYPO3\CMS\Core\Controller\CommandLineController {
 
-	/**
-	 * This is the return code.
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $return = 0;
+    /**
+     * This is the return code.
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $return = 0;
 
-	/**
-	 * Main function of the script.
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function main() {
+    /**
+     * Main function of the script.
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function main() {
 
-		switch ((string) $this->cli_args['_DEFAULT'][1]) {
+        switch ((string) $this->cli_args['_DEFAULT'][1]) {
 
-			// (Re-)Index a single document.
-			case 'index':
+            // (Re-)Index a single document.
+            case 'index':
 
-				// Add command line arguments.
-				$this->cli_options[] = array ('-doc UID/URL', 'UID or (properly encoded) URL of the document.');
+                // Add command line arguments.
+                $this->cli_options[] = array ('-doc UID/URL', 'UID or (properly encoded) URL of the document.');
 
-				$this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
+                $this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
 
-				$this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
+                $this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
 
-				// Check the command line arguments.
-				$this->cli_validateArgs();
+                // Check the command line arguments.
+                $this->cli_validateArgs();
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-doc'][0])
-					&& !\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->cli_args['-doc'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-doc'][0])
+                    && !\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->cli_args['-doc'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-doc'][0].'" is not a valid document UID or URL.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-doc'][0].'" is not a valid document UID or URL.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if ($this->return > 0) {
+                if ($this->return > 0) {
 
-					break;
+                    break;
 
-				}
+                }
 
-				// Get the document...
-				$doc =& tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], TRUE);
+                // Get the document...
+                $doc =& tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], TRUE);
 
-				if ($doc->ready) {
+                if ($doc->ready) {
 
-					// ...and save it to the database...
-					if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
+                    // ...and save it to the database...
+                    if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-						$this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" not saved and indexed.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" not saved and indexed.'.LF, TRUE);
 
-						$this->return = 1;
+                        $this->return = 1;
 
-					}
+                    }
 
-				} else {
+                } else {
 
-					$this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" could not be loaded.'.LF, TRUE);
+                    $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" could not be loaded.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				break;
+                break;
 
-			// Re-index all documents of a collection.
-			case 'reindex':
+            // Re-index all documents of a collection.
+            case 'reindex':
 
-				// Add command line arguments.
-				$this->cli_options[] = array ('-coll UID', 'UID of the collection.');
+                // Add command line arguments.
+                $this->cli_options[] = array ('-coll UID', 'UID of the collection.');
 
-				$this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
+                $this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
 
-				$this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
+                $this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
 
-				// Check the command line arguments.
-				$this->cli_validateArgs();
+                // Check the command line arguments.
+                $this->cli_validateArgs();
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-coll'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-coll'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-coll'][0].'" is not a valid collection UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-coll'][0].'" is not a valid collection UID.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
+                if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-					$this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
 
-					$this->return = 1;
+                    $this->return = 1;
 
-				}
+                }
 
-				if ($this->return > 0) {
+                if ($this->return > 0) {
 
-					break;
+                    break;
 
-				}
+                }
 
-				// Get the collection.
-				$result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-					'tx_dlf_documents.uid AS uid',
-					'tx_dlf_documents',
-					'tx_dlf_relations',
-					'tx_dlf_collections',
-					'AND tx_dlf_collections.uid='.intval($this->cli_args['-coll'][0]).' AND tx_dlf_collections.pid='.intval($this->cli_args['-pid'][0]).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-					'',
-					'',
-					''
-				);
+                // Get the collection.
+                $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+                    'tx_dlf_documents.uid AS uid',
+                    'tx_dlf_documents',
+                    'tx_dlf_relations',
+                    'tx_dlf_collections',
+                    'AND tx_dlf_collections.uid='.intval($this->cli_args['-coll'][0]).' AND tx_dlf_collections.pid='.intval($this->cli_args['-pid'][0]).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                    '',
+                    '',
+                    ''
+                );
 
-				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					// Get the document...
-					$doc =& tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], TRUE);
+                    // Get the document...
+                    $doc =& tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], TRUE);
 
-					if ($doc->ready) {
+                    if ($doc->ready) {
 
-						// ...and save it to the database...
-						if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
+                        // ...and save it to the database...
+                        if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-							$this->cli_echo('ERROR: Document "'.$resArray['uid'].'" not saved and indexed.'.LF, TRUE);
+                            $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" not saved and indexed.'.LF, TRUE);
 
-							$this->return = 1;
+                            $this->return = 1;
 
-						}
+                        }
 
-					} else {
+                    } else {
 
-						$this->cli_echo('ERROR: Document "'.$resArray['uid'].'" could not be loaded.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" could not be loaded.'.LF, TRUE);
 
-						$this->return = 1;
+                        $this->return = 1;
 
-					}
+                    }
 
-					// Clear document registry to prevent memory exhaustion.
-					tx_dlf_document::clearRegistry();
+                    // Clear document registry to prevent memory exhaustion.
+                    tx_dlf_document::clearRegistry();
 
-				}
+                }
 
-				break;
+                break;
 
-			default:
+            default:
 
-				$this->cli_help();
+                $this->cli_help();
 
-				break;
+                break;
 
-		}
+        }
 
-		exit ($this->return);
+        exit ($this->return);
 
-	}
+    }
 
-	public function __construct() {
+    public function __construct() {
 
-		// Set basic information about the script.
-		$this->cli_help = array (
-			'name' => 'Command Line Interface for Kitodo.Presentation',
-			'synopsis' => '###OPTIONS###',
-			'description' => 'Currently the only tasks available are "index" and "reindex".'.LF.'Try "/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK" for more options.',
-			'examples' => '/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK -ARG1=VALUE1 -ARG2=VALUE2',
-			'options' => '',
-			'license' => 'GNU GPL - free software!',
-			'author' => 'Kitodo. Key to digital objects e.V. <contact@kitodo.org>',
-		);
+        // Set basic information about the script.
+        $this->cli_help = array (
+            'name' => 'Command Line Interface for Kitodo.Presentation',
+            'synopsis' => '###OPTIONS###',
+            'description' => 'Currently the only tasks available are "index" and "reindex".'.LF.'Try "/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK" for more options.',
+            'examples' => '/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK -ARG1=VALUE1 -ARG2=VALUE2',
+            'options' => '',
+            'license' => 'GNU GPL - free software!',
+            'author' => 'Kitodo. Key to digital objects e.V. <contact@kitodo.org>',
+        );
 
-		// Run parent constructor.
-		parent::__construct();
+        // Run parent constructor.
+        parent::__construct();
 
-	}
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 				}
 
 				// Get the document...
-				$doc =& tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], TRUE);
+				$doc = & tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], TRUE);
 
 				if ($doc->ready) {
 
@@ -170,7 +170,7 @@ 
 				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 					// Get the document...
-					$doc =& tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], TRUE);
+					$doc = & tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], TRUE);
 
 					if ($doc->ready) {