Erikmitk / kitodo-presentation

dlf/ext_localconf.php

Spacing +2 added lines, -2 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);
@@ -65,7 +65,7 @@ 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
 
 // Register command line scripts.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array ('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
 
 // Register AJAX eID handlers.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:'.$_EXTKEY.'/plugins/search/class.tx_dlf_search_suggest.php';

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);

dlf/ext_autoload.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
 	'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
 	'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
 	'tx_dlf_audioplayer' => $extensionPath.'plugins/audioplayer/class.tx_dlf_audioplayer.php',
-    'tx_dlf_basket' => $extensionPath.'plugins/basket/class.tx_dlf_basket.php',
-    'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
+	'tx_dlf_basket' => $extensionPath.'plugins/basket/class.tx_dlf_basket.php',
+	'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
 	'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
 	'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
 	'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('dlf');
 
-return array (
+return array(
 	'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
 	'tx_dlf_alto' => $extensionPath.'common/class.tx_dlf_alto.php',
 	'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',

dlf/lib/SolrPhpClient/Apache/Solr/Document.php

Braces +4 added lines, -8 removed lines

@@ -121,8 +121,7 @@ 
 		if ($boost > 0.0)
 		{
 			$this->_documentBoost = $boost;
-		}
-		else
+		} else
 		{
 			$this->_documentBoost = false;
 		}
@@ -157,8 +156,7 @@ 
 		{
 			// create holding array if this is the first value
 			$this->_fields[$key] = array();
-		}
-		else if (!is_array($this->_fields[$key]))
+		} else if (!is_array($this->_fields[$key]))
 		{
 			// move existing value into array if it is not already an array
 			$this->_fields[$key] = array($this->_fields[$key]);
@@ -168,8 +166,7 @@ 
 		{
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
+		} else if ((float) $boost > 0.0)
 		{
 			// multiply passed boost with current field boost - similar to SolrJ implementation
 			$this->_fieldBoosts[$key] *= (float) $boost;
@@ -252,8 +249,7 @@ 
 		if ($boost > 0.0)
 		{
 			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
+		} else
 		{
 			$this->_fieldBoosts[$key] = false;
 		}

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 
 // require Apache_Solr_HttpTransport_Response
-require_once(dirname(__FILE__) . '/Response.php');
+require_once(dirname(__FILE__).'/Response.php');
 
 /**
  * Interface that all Transport (HTTP Requester) implementations must implement. These

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 			$timeout = (float) $timeout / 2;
 
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
+		} else
 		{
 			// use the default timeout pulled from default_socket_timeout otherwise
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * A Curl based HTTP transport. Uses a single curl session for all requests.

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * An alternative Curl HTTP transport that opens and closes a curl session for

dlf/lib/SolrPhpClient/Apache/Solr/Response.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-require_once(dirname(__FILE__) . '/ParserException.php');
+require_once(dirname(__FILE__).'/ParserException.php');
 
 /**
  * Represents a Solr response.  Parses the raw response into a set of stdClass objects

Braces +1 added lines, -2 removed lines

@@ -217,8 +217,7 @@
 				if ($this->_createDocuments)
 				{
 					$document = new Apache_Solr_Document();
-				}
-				else
+				} else
 				{
 					$document = $originalDocument;
 				}

dlf/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php

Spacing +14 added lines, -14 removed lines

@@ -38,9 +38,9 @@ 
 
 // See Issue #1 (http://code.google.com/p/solr-php-client/issues/detail?id=1)
 // Doesn't follow typical include path conventions, but is more convenient for users
-require_once(dirname(dirname(__FILE__)) . '/Service.php');
+require_once(dirname(dirname(__FILE__)).'/Service.php');
 
-require_once(dirname(dirname(__FILE__)) . '/NoServiceAvailableException.php');
+require_once(dirname(dirname(__FILE__)).'/NoServiceAvailableException.php');
 
 /**
  * Reference Implementation for using multiple Solr services in a distribution. Functionality
@@ -72,10 +72,10 @@ 
 	protected $_writePingTimeout = 4;
 
 	// Configuration for server selection backoff intervals
-	protected $_useBackoff = false;		// Set to true to use more resillient write server selection
-	protected $_backoffLimit = 600;		// 10 minute default maximum
-	protected $_backoffEscalation = 2.0; 	// Rate at which to increase backoff period
-	protected $_defaultBackoff = 2.0;		// Default backoff interval
+	protected $_useBackoff = false; // Set to true to use more resillient write server selection
+	protected $_backoffLimit = 600; // 10 minute default maximum
+	protected $_backoffEscalation = 2.0; // Rate at which to increase backoff period
+	protected $_defaultBackoff = 2.0; // Default backoff interval
 
 	/**
 	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
@@ -158,7 +158,7 @@ 
 	 */
 	protected function _getServiceId($host, $port, $path)
 	{
-		return $host . ':' . $port . $path;
+		return $host.':'.$port.$path;
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 
 				$this->_readableServices[$id] = $service;
 			}
@@ -211,7 +211,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 			}
 			else
 			{
@@ -249,7 +249,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 
 				$this->_writeableServices[$id] = $service;
 			}
@@ -279,7 +279,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 			}
 			else
 			{
@@ -355,7 +355,7 @@ 
 	 */
 	protected function _selectWriteService($forceSelect = false)
 	{
-		if($this->_useBackoff)
+		if ($this->_useBackoff)
 		{
 			return $this->_selectWriteServiceSafe($forceSelect);
 		}
@@ -435,12 +435,12 @@ 
 
 					$backoff *= $this->_backoffEscalation;
 
-					if($backoff > $this->_backoffLimit)
+					if ($backoff > $this->_backoffLimit)
 					{
 						throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
 					}
 
-				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
+				} while ($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
 			}
 			else
 			{

Braces +61 added lines, -62 removed lines

@@ -176,16 +176,14 @@ 
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_readableServices[$id] = $service;
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
 
 				$this->_readableServices[$id] = $service;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
@@ -206,19 +204,16 @@ 
 		if ($service instanceof Apache_Solr_Service)
 		{
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
-		}
-		else if (is_string($service))
+		} else if (is_string($service))
 		{
 			$id = $service;
 		}
@@ -244,16 +239,14 @@ 
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_writeableServices[$id] = $service;
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
 
 				$this->_writeableServices[$id] = $service;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Writeable Service description array does not have all required elements of host, port, and path');
 			}
@@ -274,19 +267,16 @@ 
 		if ($service instanceof Apache_Solr_Service)
 		{
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
-		}
-		else if (is_string($service))
+		} else if (is_string($service))
 		{
 			$id = $service;
 		}
@@ -335,8 +325,7 @@ 
 
 				$service->setCreateDocuments($this->_createDocuments);
 				$this->_currentReadService = $id;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No read services were available');
 			}
@@ -387,8 +376,7 @@ 
 				}
 
 				$this->_currentWriteService = $id;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
@@ -441,8 +429,7 @@ 
 					}
 
 				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
@@ -497,13 +484,14 @@ 
 			try
 			{
 				return $service->add($rawPost);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -532,13 +520,14 @@ 
 			try
 			{
 				return $service->addDocument($document, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -567,13 +556,14 @@ 
 			try
 			{
 				return $service->addDocuments($documents, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -601,13 +591,14 @@ 
 			try
 			{
 				return $service->commit($optimize, $waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -635,13 +626,14 @@ 
 			try
 			{
 				return $service->delete($rawPost, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -670,13 +662,14 @@ 
 			try
 			{
 				return $service->deleteById($id, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -705,13 +698,14 @@ 
 			try
 			{
 				return $service->deleteByMultipleId($ids, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -740,13 +734,14 @@ 
 			try
 			{
 				return $service->deleteByQuery($rawQuery, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -782,13 +777,14 @@ 
 			try
 			{
 				return $service->extract($file, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -826,13 +822,14 @@ 
 			try
 			{
 				return $service->extractFromString($data, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -861,13 +858,14 @@ 
 			try
 			{
 				return $service->optimize($waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -897,13 +895,14 @@ 
 			try
 			{
 				return $service->search($query, $offset, $limit, $params, $method);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectReadService(true);