kitodo / kitodo-presentation

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

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
  * Implementations can then be plugged into the Service instance in order to user their
  * the desired method for making HTTP requests
  */
-interface Apache_Solr_HttpTransport_Interface
-{
+interface Apache_Solr_HttpTransport_Interface {
 	/**
 	 * Get the current default timeout for all HTTP requests
 	 *

lib/SolrPhpClient/Apache/Solr/HttpTransportException.php

Braces +3 added lines, -6 removed lines

@@ -36,8 +36,7 @@ 
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_HttpTransportException extends Apache_Solr_Exception
-{
+class Apache_Solr_HttpTransportException extends Apache_Solr_Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -60,8 +59,7 @@ 
 	 *
 	 * @param Apache_Solr_Response $response
 	 */
-	public function __construct(Apache_Solr_Response $response)
-	{
+	public function __construct(Apache_Solr_Response $response) {
 		parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
 
 		$this->_response = $response;
@@ -72,8 +70,7 @@ 
 	 *
 	 * @return Apache_Solr_Response
 	 */
-	public function getResponse()
-	{
+	public function getResponse() {
 		return $this->_response;
 	}
 }
\ No newline at end of file

lib/SolrPhpClient/Apache/Solr/NoServiceAvailableException.php

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_NoServiceAvailableException extends Apache_Solr_Exception
-{
+class Apache_Solr_NoServiceAvailableException extends Apache_Solr_Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */

lib/SolrPhpClient/Apache/Solr/Response.php

Braces +20 added lines, -41 removed lines

@@ -45,8 +45,7 @@ 
  * Currently requires json_decode which is bundled with PHP >= 5.2.0, Alternatively can be
  * installed with PECL.  Zend Framework also includes a purely PHP solution.
  */
-class Apache_Solr_Response
-{
+class Apache_Solr_Response {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -94,8 +93,7 @@ 
 	 * @param boolean $createDocuments Whether to convert the documents json_decoded as stdClass instances to Apache_Solr_Document instances
 	 * @param boolean $collapseSingleValueArrays Whether to make multivalued fields appear as single values
 	 */
-	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true)
-	{
+	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true) {
 		$this->_response = $response;
 		$this->_createDocuments = (bool) $createDocuments;
 		$this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
@@ -106,8 +104,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getHttpStatus()
-	{
+	public function getHttpStatus() {
 		return $this->_response->getStatusCode();
 	}
 
@@ -116,8 +113,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getHttpStatusMessage()
-	{
+	public function getHttpStatusMessage() {
 		return $this->_response->getStatusMessage();
 	}
 
@@ -126,8 +122,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getType()
-	{
+	public function getType() {
 		return $this->_response->getMimeType();
 	}
 
@@ -136,8 +131,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getEncoding()
-	{
+	public function getEncoding() {
 		return $this->_response->getEncoding();
 	}
 
@@ -146,8 +140,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getRawResponse()
-	{
+	public function getRawResponse() {
 		return $this->_response->getBody();
 	}
 
@@ -157,16 +150,13 @@ 
 	 * @param string $key
 	 * @return mixed
 	 */
-	public function __get($key)
-	{
-		if (!$this->_isParsed)
-		{
+	public function __get($key) {
+		if (!$this->_isParsed) {
 			$this->_parseData();
 			$this->_isParsed = true;
 		}
 
-		if (isset($this->_parsedData->$key))
-		{
+		if (isset($this->_parsedData->$key)) {
 			return $this->_parsedData->$key;
 		}
 
@@ -179,10 +169,8 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	public function __isset($key)
-	{
-		if (!$this->_isParsed)
-		{
+	public function __isset($key) {
+		if (!$this->_isParsed) {
 			$this->_parseData();
 			$this->_isParsed = true;
 		}
@@ -195,41 +183,32 @@ 
 	 *
 	 * @throws Apache_Solr_ParserException If the data could not be parsed
 	 */
-	protected function _parseData()
-	{
+	protected function _parseData() {
 		//An alternative would be to use Zend_Json::decode(...)
 		$data = json_decode($this->_response->getBody());
 
 		// check that we receive a valid JSON response - we should never receive a null
-		if ($data === null)
-		{
+		if ($data === null) {
 			throw new Apache_Solr_ParserException('Solr response does not appear to be valid JSON, please examine the raw response with getRawResponse() method');
 		}
 
 		//if we're configured to collapse single valued arrays or to convert them to Apache_Solr_Document objects
 		//and we have response documents, then try to collapse the values and / or convert them now
-		if (($this->_createDocuments || $this->_collapseSingleValueArrays) && isset($data->response) && is_array($data->response->docs))
-		{
+		if (($this->_createDocuments || $this->_collapseSingleValueArrays) && isset($data->response) && is_array($data->response->docs)) {
 			$documents = array();
 
-			foreach ($data->response->docs as $originalDocument)
-			{
-				if ($this->_createDocuments)
-				{
+			foreach ($data->response->docs as $originalDocument) {
+				if ($this->_createDocuments) {
 					$document = new Apache_Solr_Document();
-				}
-				else
-				{
+				} else {
 					$document = $originalDocument;
 				}
 
-				foreach ($originalDocument as $key => $value)
-				{
+				foreach ($originalDocument as $key => $value) {
 					//If a result is an array with only a single
 					//value then its nice to be able to access
 					//it as if it were always a single value
-					if ($this->_collapseSingleValueArrays && is_array($value) && count($value) <= 1)
-					{
+					if ($this->_collapseSingleValueArrays && is_array($value) && count($value) <= 1) {
 						$value = array_shift($value);
 					}
 

lib/SolrPhpClient/Apache/Solr/ParserException.php

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_ParserException extends Apache_Solr_Exception
-{
+class Apache_Solr_ParserException extends Apache_Solr_Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */

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

Braces +143 added lines, -251 removed lines

@@ -48,8 +48,7 @@ 
  * 	routing of read / write operations
  * 	failover (on selection) for multiple read servers
  */
-class Apache_Solr_Service_Balancer
-{
+class Apache_Solr_Service_Balancer {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -85,8 +84,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function escape($value)
-	{
+	static public function escape($value) {
 		return Apache_Solr_Service::escape($value);
 	}
 
@@ -96,8 +94,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function escapePhrase($value)
-	{
+	static public function escapePhrase($value) {
 		return Apache_Solr_Service::escapePhrase($value);
 	}
 
@@ -107,8 +104,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function phrase($value)
-	{
+	static public function phrase($value) {
 		return Apache_Solr_Service::phrase($value);
 	}
 
@@ -118,33 +114,27 @@ 
 	 * @param array $readableServices
 	 * @param array $writeableServices
 	 */
-	public function __construct($readableServices = array(), $writeableServices = array())
-	{
+	public function __construct($readableServices = array(), $writeableServices = array()) {
 		//setup readable services
-		foreach ($readableServices as $service)
-		{
+		foreach ($readableServices as $service) {
 			$this->addReadService($service);
 		}
 
 		//setup writeable services
-		foreach ($writeableServices as $service)
-		{
+		foreach ($writeableServices as $service) {
 			$this->addWriteService($service);
 		}
 	}
 
-	public function setReadPingTimeout($timeout)
-	{
+	public function setReadPingTimeout($timeout) {
 		$this->_readPingTimeout = $timeout;
 	}
 
-	public function setWritePingTimeout($timeout)
-	{
+	public function setWritePingTimeout($timeout) {
 		$this->_writePingTimeout = $timeout;
 	}
 
-	public function setUseBackoff($enable)
-	{
+	public function setUseBackoff($enable) {
 		$this->_useBackoff = $enable;
 	}
 
@@ -156,8 +146,7 @@ 
 	 * @param string $path
 	 * @return string
 	 */
-	protected function _getServiceId($host, $port, $path)
-	{
+	protected function _getServiceId($host, $port, $path) {
 		return $host . ':' . $port . $path;
 	}
 
@@ -169,24 +158,17 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
 	 */
-	public function addReadService($service)
-	{
-		if ($service instanceof Apache_Solr_Service)
-		{
+	public function addReadService($service) {
+		if ($service instanceof Apache_Solr_Service) {
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_readableServices[$id] = $service;
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
+		} 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');
 			}
 		}
@@ -199,32 +181,22 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
 	 */
-	public function removeReadService($service)
-	{
+	public function removeReadService($service) {
 		$id = '';
 
-		if ($service instanceof Apache_Solr_Service)
-		{
+		if ($service instanceof Apache_Solr_Service) {
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
+		} 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;
 		}
 
-		if ($id && isset($this->_readableServices[$id]))
-		{
+		if ($id && isset($this->_readableServices[$id])) {
 			unset($this->_readableServices[$id]);
 		}
 	}
@@ -237,24 +209,17 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
 	 */
-	public function addWriteService($service)
-	{
-		if ($service instanceof Apache_Solr_Service)
-		{
+	public function addWriteService($service) {
+		if ($service instanceof Apache_Solr_Service) {
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_writeableServices[$id] = $service;
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
+		} 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');
 			}
 		}
@@ -267,32 +232,22 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
 	 */
-	public function removeWriteService($service)
-	{
+	public function removeWriteService($service) {
 		$id = '';
 
-		if ($service instanceof Apache_Solr_Service)
-		{
+		if ($service instanceof Apache_Solr_Service) {
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
+		} 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;
 		}
 
-		if ($id && isset($this->_writeableServices[$id]))
-		{
+		if ($id && isset($this->_writeableServices[$id])) {
 			unset($this->_writeableServices[$id]);
 		}
 	}
@@ -305,29 +260,23 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no read services that meet requirements
 	 */
-	protected function _selectReadService($forceSelect = false)
-	{
-		if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect)
-		{
-			if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect)
-			{
+	protected function _selectReadService($forceSelect = false) {
+		if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect) {
+			if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect) {
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false)
-				{
+				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false) {
 					$this->removeReadService($this->_currentReadService);
 				}
 			}
 
-			if (count($this->_readableServices))
-			{
+			if (count($this->_readableServices)) {
 				// select one of the read services at random
 				$ids = array_keys($this->_readableServices);
 
 				$id = $ids[rand(0, count($ids) - 1)];
 				$service = $this->_readableServices[$id];
 
-				if (is_array($service))
-				{
+				if (is_array($service)) {
 					//convert the array definition to a client object
 					$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
 					$this->_readableServices[$id] = $service;
@@ -335,9 +284,7 @@ 
 
 				$service->setCreateDocuments($this->_createDocuments);
 				$this->_currentReadService = $id;
-			}
-			else
-			{
+			} else {
 				throw new Apache_Solr_NoServiceAvailableException('No read services were available');
 			}
 		}
@@ -353,43 +300,34 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
-	protected function _selectWriteService($forceSelect = false)
-	{
-		if($this->_useBackoff)
-		{
+	protected function _selectWriteService($forceSelect = false) {
+		if($this->_useBackoff) {
 			return $this->_selectWriteServiceSafe($forceSelect);
 		}
 
-		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
-		{
-			if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect)
-			{
+		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect) {
+			if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect) {
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false)
-				{
+				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false) {
 					$this->removeWriteService($this->_currentWriteService);
 				}
 			}
 
-			if (count($this->_writeableServices))
-			{
+			if (count($this->_writeableServices)) {
 				// select one of the read services at random
 				$ids = array_keys($this->_writeableServices);
 
 				$id = $ids[rand(0, count($ids) - 1)];
 				$service = $this->_writeableServices[$id];
 
-				if (is_array($service))
-				{
+				if (is_array($service)) {
 					//convert the array definition to a client object
 					$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
 					$this->_writeableServices[$id] = $service;
 				}
 
 				$this->_currentWriteService = $id;
-			}
-			else
-			{
+			} else {
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
 		}
@@ -409,12 +347,9 @@ 
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
 
-	protected function _selectWriteServiceSafe($forceSelect = false)
-	{
-		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
-		{
-			if (count($this->_writeableServices))
-			{
+	protected function _selectWriteServiceSafe($forceSelect = false) {
+		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect) {
+			if (count($this->_writeableServices)) {
 				$backoff = $this->_defaultBackoff;
 
 				do {
@@ -424,8 +359,7 @@ 
 					$id = $ids[rand(0, count($ids) - 1)];
 					$service = $this->_writeableServices[$id];
 
-					if (is_array($service))
-					{
+					if (is_array($service)) {
 						//convert the array definition to a client object
 						$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
 						$this->_writeableServices[$id] = $service;
@@ -435,15 +369,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);
-			}
-			else
-			{
+			} else {
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
 		}
@@ -457,13 +388,11 @@ 
 	 *
 	 * @param boolean $createDocuments
 	 */
-	public function setCreateDocuments($createDocuments)
-	{
+	public function setCreateDocuments($createDocuments) {
 		$this->_createDocuments = (bool) $createDocuments;
 
 		// set on current read service
-		if ($this->_currentReadService)
-		{
+		if ($this->_currentReadService) {
 			$service = $this->_selectReadService();
 			$service->setCreateDocuments($createDocuments);
 		}
@@ -474,8 +403,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function getCreateDocuments()
-	{
+	public function getCreateDocuments() {
 		return $this->_createDocuments;
 	}
 	
@@ -488,22 +416,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function add($rawPost)
-	{
+	public function add($rawPost) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->add($rawPost);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -523,22 +448,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
-	{
+	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->addDocument($document, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -558,22 +480,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
-	{
+	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->addDocuments($documents, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -592,22 +511,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
+	public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->commit($optimize, $waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -626,22 +542,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function delete($rawPost, $timeout = 3600)
-	{
+	public function delete($rawPost, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->delete($rawPost, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -661,22 +574,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->deleteById($id, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -696,22 +606,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->deleteByMultipleId($ids, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -731,22 +638,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->deleteByQuery($rawQuery, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -773,22 +677,19 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
+	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream') {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->extract($file, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -817,22 +718,19 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
+	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream') {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->extractFromString($data, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -852,22 +750,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
+	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600) {
 		$service = $this->_selectWriteService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->optimize($waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -888,22 +783,19 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = Apache_Solr_Service::METHOD_GET)
-	{
+	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = Apache_Solr_Service::METHOD_GET) {
 		$service = $this->_selectReadService();
 
-		do
-		{
-			try
-			{
+		do {
+			try {
 				return $service->search($query, $offset, $limit, $params, $method);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+			} catch (Apache_Solr_HttpTransportException $e) {
+				if ($e->getCode() != 0) {
+				    //IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectReadService(true);

lib/SolrPhpClient/Apache/Solr/Service.php

Braces +99 added lines, -212 removed lines

@@ -83,8 +83,7 @@ 
  * @todo Investigate using other HTTP clients other than file_get_contents built-in handler. Could provide performance
  * improvements when dealing with multiple requests by using HTTP's keep alive functionality
  */
-class Apache_Solr_Service
-{
+class Apache_Solr_Service {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -189,8 +188,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function escape($value)
-	{
+	static public function escape($value) {
 		//list taken from http://lucene.apache.org/java/docs/queryparsersyntax.html#Escaping%20Special%20Characters
 		$pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
 		$replace = '\\\$1';
@@ -204,8 +202,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function escapePhrase($value)
-	{
+	static public function escapePhrase($value) {
 		$pattern = '/("|\\\)/';
 		$replace = '\\\$1';
 
@@ -218,8 +215,7 @@ 
 	 * @param string $value
 	 * @return string
 	 */
-	static public function phrase($value)
-	{
+	static public function phrase($value) {
 		return '"' . self::escapePhrase($value) . '"';
 	}
 
@@ -232,16 +228,14 @@ 
 	 * @param string $path
 	 * @param Apache_Solr_HttpTransport_Interface $httpTransport
 	 */
-	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false)
-	{
+	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false) {
 		$this->setHost($host);
 		$this->setPort($port);
 		$this->setPath($path);
 
 		$this->_initUrls();
 
-		if ($httpTransport)
-		{
+		if ($httpTransport) {
 			$this->setHttpTransport($httpTransport);
 		}
 
@@ -255,22 +249,17 @@ 
 	 * @param string $servlet
 	 * @return string
 	 */
-	protected function _constructUrl($servlet, $params = array())
-	{
-		if (count($params))
-		{
+	protected function _constructUrl($servlet, $params = array()) {
+		if (count($params)) {
 			//escape all parameters appropriately for inclusion in the query string
 			$escapedParams = array();
 
-			foreach ($params as $key => $value)
-			{
+			foreach ($params as $key => $value) {
 				$escapedParams[] = urlencode($key) . '=' . urlencode($value);
 			}
 
 			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
-		}
-		else
-		{
+		} else {
 			$queryString = '';
 		}
 
@@ -280,8 +269,7 @@ 
 	/**
 	 * Construct the Full URLs for the three servlets we reference
 	 */
-	protected function _initUrls()
-	{
+	protected function _initUrls() {
 		//Initialize our full servlet URLs now that we have server information
 		$this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET);
 		$this->_pingUrl = $this->_constructUrl(self::PING_SERVLET);
@@ -292,8 +280,7 @@ 
 		$this->_urlsInited = true;
 	}
 
-	protected function _generateQueryString($params)
-	{
+	protected function _generateQueryString($params) {
 		// use http_build_query to encode our arguments because its faster
 		// than urlencoding all the parts ourselves in a loop
 		//
@@ -305,13 +292,10 @@ 
 		// NOTE: before php 5.1.3 brackets were not url encoded by http_build query - we've checked
 		// the php version in the constructor and put the results in the instance variable. Also, before
 		// 5.1.2 the arg_separator parameter was not available, so don't use it
-		if ($this->_queryBracketsEscaped)
-		{
+		if ($this->_queryBracketsEscaped) {
 			$queryString = http_build_query($params, null, $this->_queryStringDelimiter);
 			return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
-		}
-		else
-		{
+		} else {
 			$queryString = http_build_query($params);
 			return preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $queryString);
 		}
@@ -326,15 +310,13 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
 	 */
-	protected function _sendRawGet($url, $timeout = FALSE)
-	{
+	protected function _sendRawGet($url, $timeout = FALSE) {
 		$httpTransport = $this->getHttpTransport();
 
 		$httpResponse = $httpTransport->performGetRequest($url, $timeout);
 		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
 
-		if ($solrResponse->getHttpStatus() != 200)
-		{
+		if ($solrResponse->getHttpStatus() != 200) {
 			throw new Apache_Solr_HttpTransportException($solrResponse);
 		}
 
@@ -352,15 +334,13 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
 	 */
-	protected function _sendRawPost($url, $rawPost, $timeout = FALSE, $contentType = 'text/xml; charset=UTF-8')
-	{
+	protected function _sendRawPost($url, $rawPost, $timeout = FALSE, $contentType = 'text/xml; charset=UTF-8') {
 		$httpTransport = $this->getHttpTransport();
 
 		$httpResponse = $httpTransport->performPostRequest($url, $rawPost, $contentType, $timeout);
 		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
 
-		if ($solrResponse->getHttpStatus() != 200)
-		{
+		if ($solrResponse->getHttpStatus() != 200) {
 			throw new Apache_Solr_HttpTransportException($solrResponse);
 		}
 
@@ -372,8 +352,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getHost()
-	{
+	public function getHost() {
 		return $this->_host;
 	}
 
@@ -384,20 +363,15 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If the host parameter is empty
 	 */
-	public function setHost($host)
-	{
+	public function setHost($host) {
 		//Use the provided host or use the default
-		if (empty($host))
-		{
+		if (empty($host)) {
 			throw new Apache_Solr_InvalidArgumentException('Host parameter is empty');
-		}
-		else
-		{
+		} else {
 			$this->_host = $host;
 		}
 
-		if ($this->_urlsInited)
-		{
+		if ($this->_urlsInited) {
 			$this->_initUrls();
 		}
 	}
@@ -407,8 +381,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getPort()
-	{
+	public function getPort() {
 		return $this->_port;
 	}
 
@@ -419,22 +392,17 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException If the port parameter is empty
 	 */
-	public function setPort($port)
-	{
+	public function setPort($port) {
 		//Use the provided port or use the default
 		$port = (int) $port;
 
-		if ($port <= 0)
-		{
+		if ($port <= 0) {
 			throw new Apache_Solr_InvalidArgumentException('Port is not a valid port number');
-		}
-		else
-		{
+		} else {
 			$this->_port = $port;
 		}
 
-		if ($this->_urlsInited)
-		{
+		if ($this->_urlsInited) {
 			$this->_initUrls();
 		}
 	}
@@ -444,8 +412,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPath()
-	{
+	public function getPath() {
 		return $this->_path;
 	}
 
@@ -454,14 +421,12 @@ 
 	 *
 	 * @param string $path
 	 */
-	public function setPath($path)
-	{
+	public function setPath($path) {
 		$path = trim($path, '/');
 
 		$this->_path = '/' . $path . '/';
 
-		if ($this->_urlsInited)
-		{
+		if ($this->_urlsInited) {
 			$this->_initUrls();
 		}
 	}
@@ -471,11 +436,9 @@ 
 	 *
 	 * @return HttpTransportInterface
 	 */
-	public function getHttpTransport()
-	{
+	public function getHttpTransport() {
 		// lazy load a default if one has not be set
-		if ($this->_httpTransport === false)
-		{
+		if ($this->_httpTransport === false) {
 			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
 
 			$this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents();
@@ -489,8 +452,7 @@ 
 	 *
 	 * @param Apache_Solr_HttpTransport_Interface
 	 */
-	public function setHttpTransport(Apache_Solr_HttpTransport_Interface $httpTransport)
-	{
+	public function setHttpTransport(Apache_Solr_HttpTransport_Interface $httpTransport) {
 		$this->_httpTransport = $httpTransport;
 	}
 
@@ -500,8 +462,7 @@ 
 	 *
 	 * @param boolean $createDocuments
 	 */
-	public function setCreateDocuments($createDocuments)
-	{
+	public function setCreateDocuments($createDocuments) {
 		$this->_createDocuments = (bool) $createDocuments;
 	}
 
@@ -510,8 +471,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function getCreateDocuments()
-	{
+	public function getCreateDocuments() {
 		return $this->_createDocuments;
 	}
 
@@ -520,8 +480,7 @@ 
 	 *
 	 * @param boolean $collapseSingleValueArrays
 	 */
-	public function setCollapseSingleValueArrays($collapseSingleValueArrays)
-	{
+	public function setCollapseSingleValueArrays($collapseSingleValueArrays) {
 		$this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
 	}
 
@@ -530,8 +489,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function getCollapseSingleValueArrays()
-	{
+	public function getCollapseSingleValueArrays() {
 		return $this->_collapseSingleValueArrays;
 	}
 
@@ -543,8 +501,7 @@ 
 	 *
 	 * @deprecated Use the getDefaultTimeout method on the HTTP transport implementation
 	 */
-	public function getDefaultTimeout()
-	{
+	public function getDefaultTimeout() {
 		return $this->getHttpTransport()->getDefaultTimeout();
 	}
 
@@ -555,8 +512,7 @@ 
 	 *
 	 * @deprecated Use the setDefaultTimeout method on the HTTP transport implementation
 	 */
-	public function setDefaultTimeout($timeout)
-	{
+	public function setDefaultTimeout($timeout) {
 		$this->getHttpTransport()->setDefaultTimeout($timeout);
 	}
 
@@ -567,10 +523,8 @@ 
 	 * @param string $namedListTreatment
 	 * @throws Apache_Solr_InvalidArgumentException If invalid option is set
 	 */
-	public function setNamedListTreatment($namedListTreatment)
-	{
-		switch ((string) $namedListTreatment)
-		{
+	public function setNamedListTreatment($namedListTreatment) {
+		switch ((string) $namedListTreatment) {
 			case Apache_Solr_Service::NAMED_LIST_FLAT:
 				$this->_namedListTreatment = Apache_Solr_Service::NAMED_LIST_FLAT;
 				break;
@@ -589,8 +543,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getNamedListTreatment()
-	{
+	public function getNamedListTreatment() {
 		return $this->_namedListTreatment;
 	}
 
@@ -600,8 +553,7 @@ 
 	 *
 	 * @param string $queryDelimiter
 	 */
-	public function setQueryDelimiter($queryDelimiter)
-	{
+	public function setQueryDelimiter($queryDelimiter) {
 		$this->_queryDelimiter = $queryDelimiter;
 	}
 
@@ -611,8 +563,7 @@ 
 	 *
 	 * @param string $queryStringDelimiter
 	 */
-	public function setQueryStringDelimiter($queryStringDelimiter)
-	{
+	public function setQueryStringDelimiter($queryStringDelimiter) {
 		$this->_queryStringDelimiter = $queryStringDelimiter;
 	}
 
@@ -623,8 +574,7 @@ 
 	 * @param float $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
 	 * @return float Actual time taken to ping the server, FALSE if timeout or HTTP error status occurs
 	 */
-	public function ping($timeout = 2)
-	{
+	public function ping($timeout = 2) {
 		$start = microtime(true);
 		
 		$httpTransport = $this->getHttpTransport();
@@ -632,12 +582,9 @@ 
 		$httpResponse = $httpTransport->performHeadRequest($this->_pingUrl, $timeout);
 		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
 
-		if ($solrResponse->getHttpStatus() == 200)
-		{
+		if ($solrResponse->getHttpStatus() == 200) {
 			return microtime(true) - $start;
-		}
-		else
-		{
+		} else {
 			return false;
 		}
 	}
@@ -650,8 +597,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function threads()
-	{
+	public function threads() {
 		return $this->_sendRawGet($this->_threadsUrl);
 	}
 
@@ -664,8 +610,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function add($rawPost)
-	{
+	public function add($rawPost) {
 		return $this->_sendRawPost($this->_updateUrl, $rawPost);
 	}
 
@@ -681,8 +626,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
-	{
+	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0) {
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
 		$committedValue = $overwriteCommitted ? 'true' : 'false';
@@ -709,8 +653,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
-	{
+	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0) {
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
 		$committedValue = $overwriteCommitted ? 'true' : 'false';
@@ -720,10 +663,8 @@ 
 
 		$rawPost = "<add allowDups=\"{$dupValue}\" overwritePending=\"{$pendingValue}\" overwriteCommitted=\"{$committedValue}\"{$commitWithinString}>";
 
-		foreach ($documents as $document)
-		{
-			if ($document instanceof Apache_Solr_Document)
-			{
+		foreach ($documents as $document) {
+			if ($document instanceof Apache_Solr_Document) {
 				$rawPost .= $this->_documentToXmlFragment($document);
 			}
 		}
@@ -738,30 +679,24 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _documentToXmlFragment(Apache_Solr_Document $document)
-	{
+	protected function _documentToXmlFragment(Apache_Solr_Document $document) {
 		$xml = '<doc';
 
-		if ($document->getBoost() !== false)
-		{
+		if ($document->getBoost() !== false) {
 			$xml .= ' boost="' . $document->getBoost() . '"';
 		}
 
 		$xml .= '>';
 
-		foreach ($document as $key => $value)
-		{
+		foreach ($document as $key => $value) {
 			$key = htmlspecialchars($key, ENT_QUOTES, 'UTF-8');
 			$fieldBoost = $document->getFieldBoost($key);
 
-			if (is_array($value))
-			{
-				foreach ($value as $multivalue)
-				{
+			if (is_array($value)) {
+				foreach ($value as $multivalue) {
 					$xml .= '<field name="' . $key . '"';
 
-					if ($fieldBoost !== false)
-					{
+					if ($fieldBoost !== false) {
 						$xml .= ' boost="' . $fieldBoost . '"';
 
 						// only set the boost for the first field in the set
@@ -772,13 +707,10 @@ 
 
 					$xml .= '>' . $multivalue . '</field>';
 				}
-			}
-			else
-			{
+			} else {
 				$xml .= '<field name="' . $key . '"';
 
-				if ($fieldBoost !== false)
-				{
+				if ($fieldBoost !== false) {
 					$xml .= ' boost="' . $fieldBoost . '"';
 				}
 
@@ -800,8 +732,7 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	protected function _stripCtrlChars($string)
-	{
+	protected function _stripCtrlChars($string) {
 		// See:  http://w3.org/International/questions/qa-forms-utf-8.html
 		// Printable utf-8 does not include any of these chars below x7F
 		return preg_replace('@[\x00-\x08\x0B\x0C\x0E-\x1F]@', ' ', $string);
@@ -818,8 +749,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
+	public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600) {
 		$expungeValue = $expungeDeletes ? 'true' : 'false';
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
@@ -839,8 +769,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function delete($rawPost, $timeout = 3600)
-	{
+	public function delete($rawPost, $timeout = 3600) {
 		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
 	}
 
@@ -855,8 +784,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
 
@@ -879,15 +807,13 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
 
 		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">';
 
-		foreach ($ids as $id)
-		{
+		foreach ($ids as $id) {
 			//escape special xml characters
 			$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
 
@@ -910,8 +836,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
+	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600) {
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
 
@@ -941,43 +866,33 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
+	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream') {
 		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
+		if (!is_null($params)) {
+			if (!is_array($params)) {
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
-		{
+		} else {
 			$params = array();
 		}
 		
 		// if $file is an http request, defer to extractFromUrl instead
-		if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://')
-		{
+		if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://') {
 			return $this->extractFromUrl($file, $params, $document, $mimetype);
 		}
 		
 		// read the contents of the file
 		$contents = @file_get_contents($file);
 
-		if ($contents !== false)
-		{
+		if ($contents !== false) {
 			// add the resource.name parameter if not specified
-			if (!isset($params['resource.name']))
-			{
+			if (!isset($params['resource.name'])) {
 				$params['resource.name'] = basename($file);
 			}
 
 			// delegate the rest to extractFromString
 			return $this->extractFromString($contents, $params, $document, $mimetype);
-		}
-		else
-		{
+		} else {
 			throw new Apache_Solr_InvalidArgumentException("File '{$file}' is empty or could not be read");
 		}
 	}
@@ -1002,18 +917,13 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
+	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream') {
 		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
+		if (!is_null($params)) {
+			if (!is_array($params)) {
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
-		{
+		} else {
 			$params = array();
 		}
 
@@ -1022,16 +932,13 @@ 
 		$params['json.nl'] = $this->_namedListTreatment;
 
 		// check if $document is an Apache_Solr_Document instance
-		if (!is_null($document) && $document instanceof Apache_Solr_Document)
-		{
+		if (!is_null($document) && $document instanceof Apache_Solr_Document) {
 			// iterate document, adding literal.* and boost.* fields to $params as appropriate
-			foreach ($document as $field => $fieldValue)
-			{
+			foreach ($document as $field => $fieldValue) {
 				// check if we need to add a boost.* parameters
 				$fieldBoost = $document->getFieldBoost($field);
 
-				if ($fieldBoost !== false)
-				{
+				if ($fieldBoost !== false) {
 					$params["boost.{$field}"] = $fieldBoost;
 				}
 
@@ -1065,18 +972,13 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
 	 */
-	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
+	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream') {
 		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
+		if (!is_null($params)) {
+			if (!is_array($params)) {
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
-		{
+		} else {
 			$params = array();
 		}
 
@@ -1086,19 +988,15 @@ 
 		$httpResponse = $httpTransport->performGetRequest($url);
 		
 		// check that its a 200 response
-		if ($httpResponse->getStatusCode() == 200)
-		{
+		if ($httpResponse->getStatusCode() == 200) {
 			// add the resource.name parameter if not specified
-			if (!isset($params['resource.name']))
-			{
+			if (!isset($params['resource.name'])) {
 				$params['resource.name'] = $url;
 			}
 
 			// delegate the rest to extractFromString
 			return $this->extractFromString($httpResponse->getBody(), $params, $document, $mimetype);
-		}
-		else
-		{
+		} else {
 			throw new Apache_Solr_InvalidArgumentException("URL '{$url}' returned non 200 response code");
 		}
 	}
@@ -1114,8 +1012,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
+	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600) {
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
 
@@ -1137,19 +1034,14 @@ 
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 * @throws Apache_Solr_InvalidArgumentException If an invalid HTTP method is used
 	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = self::METHOD_GET)
-	{
+	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = self::METHOD_GET) {
 		// ensure params is an array
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
+		if (!is_null($params)) {
+			if (!is_array($params)) {
 				// params was specified but was not an array - invalid
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
-		{
+		} else {
 			$params = array();
 		}
 		
@@ -1165,16 +1057,11 @@ 
 
 		$queryString = $this->_generateQueryString($params);
 
-		if ($method == self::METHOD_GET)
-		{
+		if ($method == self::METHOD_GET) {
 			return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
-		}
-		else if ($method == self::METHOD_POST)
-		{
+		} else if ($method == self::METHOD_POST) {
 			return $this->_sendRawPost($this->_searchUrl, $queryString, FALSE, 'application/x-www-form-urlencoded; charset=UTF-8');
-		}
-		else
-		{
+		} else {
 			throw new Apache_Solr_InvalidArgumentException("Unsupported method '$method', please use the Apache_Solr_Service::METHOD_* constants");
 		}
 	}

common/class.tx_dlf_document.php

Braces +1 added lines, -1 removed lines

@@ -927,7 +927,7 @@
 
 			foreach($this->physicalStructureInfo as $page) {
 
-				if(strpos($page['orderlabel'], $logicalPage) !== false){
+				if(strpos($page['orderlabel'], $logicalPage) !== false) {
 
 					$this->lastSearchedPhysicalPage['logicalPage'] = $logicalPage;
 					$this->lastSearchedPhysicalPage['physicalPage'] = $physicalPage;

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