Erikmitk / kitodo-presentation

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

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

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

lib/SolrPhpClient/Apache/Solr/Service.php

Spacing +29 added lines, -29 removed lines

@@ -38,14 +38,14 @@ 
 
 // 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(__FILE__) . '/Exception.php');
-require_once(dirname(__FILE__) . '/HttpTransportException.php');
-require_once(dirname(__FILE__) . '/InvalidArgumentException.php');
+require_once(dirname(__FILE__).'/Exception.php');
+require_once(dirname(__FILE__).'/HttpTransportException.php');
+require_once(dirname(__FILE__).'/InvalidArgumentException.php');
 
-require_once(dirname(__FILE__) . '/Document.php');
-require_once(dirname(__FILE__) . '/Response.php');
+require_once(dirname(__FILE__).'/Document.php');
+require_once(dirname(__FILE__).'/Response.php');
 
-require_once(dirname(__FILE__) . '/HttpTransport/Interface.php');
+require_once(dirname(__FILE__).'/HttpTransport/Interface.php');
 
 /**
  * Starting point for the Solr API. Represents a Solr server resource and has
@@ -220,7 +220,7 @@ 
 	 */
 	static public function phrase($value)
 	{
-		return '"' . self::escapePhrase($value) . '"';
+		return '"'.self::escapePhrase($value).'"';
 	}
 
 	/**
@@ -264,17 +264,17 @@ 
 
 			foreach ($params as $key => $value)
 			{
-				$escapedParams[] = urlencode($key) . '=' . urlencode($value);
+				$escapedParams[] = urlencode($key).'='.urlencode($value);
 			}
 
-			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
+			$queryString = $this->_queryDelimiter.implode($this->_queryStringDelimiter, $escapedParams);
 		}
 		else
 		{
 			$queryString = '';
 		}
 
-		return 'http://' . $this->_host . ':' . $this->_port . $this->_path . $servlet . $queryString;
+		return 'http://'.$this->_host.':'.$this->_port.$this->_path.$servlet.$queryString;
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 		$this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET);
 		$this->_pingUrl = $this->_constructUrl(self::PING_SERVLET);
 		$this->_searchUrl = $this->_constructUrl(self::SEARCH_SERVLET);
-		$this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER ));
-		$this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER ));
+		$this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER));
+		$this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER));
 
 		$this->_urlsInited = true;
 	}
@@ -458,7 +458,7 @@ 
 	{
 		$path = trim($path, '/');
 
-		$this->_path = '/' . $path . '/';
+		$this->_path = '/'.$path.'/';
 
 		if ($this->_urlsInited)
 		{
@@ -476,7 +476,7 @@ 
 		// lazy load a default if one has not be set
 		if ($this->_httpTransport === false)
 		{
-			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
+			require_once(dirname(__FILE__).'/HttpTransport/FileGetContents.php');
 
 			$this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents();
 		}
@@ -744,7 +744,7 @@ 
 
 		if ($document->getBoost() !== false)
 		{
-			$xml .= ' boost="' . $document->getBoost() . '"';
+			$xml .= ' boost="'.$document->getBoost().'"';
 		}
 
 		$xml .= '>';
@@ -758,11 +758,11 @@ 
 			{
 				foreach ($value as $multivalue)
 				{
-					$xml .= '<field name="' . $key . '"';
+					$xml .= '<field name="'.$key.'"';
 
 					if ($fieldBoost !== false)
 					{
-						$xml .= ' boost="' . $fieldBoost . '"';
+						$xml .= ' boost="'.$fieldBoost.'"';
 
 						// only set the boost for the first field in the set
 						$fieldBoost = false;
@@ -770,21 +770,21 @@ 
 
 					$multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
 
-					$xml .= '>' . $multivalue . '</field>';
+					$xml .= '>'.$multivalue.'</field>';
 				}
 			}
 			else
 			{
-				$xml .= '<field name="' . $key . '"';
+				$xml .= '<field name="'.$key.'"';
 
 				if ($fieldBoost !== false)
 				{
-					$xml .= ' boost="' . $fieldBoost . '"';
+					$xml .= ' boost="'.$fieldBoost.'"';
 				}
 
 				$value = htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
 
-				$xml .= '>' . $value . '</field>';
+				$xml .= '>'.$value.'</field>';
 			}
 		}
 
@@ -824,7 +824,7 @@ 
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
 
-		$rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+		$rawPost = '<commit expungeDeletes="'.$expungeValue.'" waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />';
 
 		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
 	}
@@ -863,7 +863,7 @@ 
 		//escape special xml characters
 		$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><id>' . $id . '</id></delete>';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><id>'.$id.'</id></delete>';
 
 		return $this->delete($rawPost, $timeout);
 	}
@@ -884,14 +884,14 @@ 
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'">';
 
 		foreach ($ids as $id)
 		{
 			//escape special xml characters
 			$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
 
-			$rawPost .= '<id>' . $id . '</id>';
+			$rawPost .= '<id>'.$id.'</id>';
 		}
 
 		$rawPost .= '</delete>';
@@ -918,7 +918,7 @@ 
 		// escape special xml characters
 		$rawQuery = htmlspecialchars($rawQuery, ENT_NOQUOTES, 'UTF-8');
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><query>' . $rawQuery . '</query></delete>';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><query>'.$rawQuery.'</query></delete>';
 
 		return $this->delete($rawPost, $timeout);
 	}
@@ -1044,7 +1044,7 @@ 
 		$queryString = $this->_generateQueryString($params);
 
 		// the file contents will be sent to SOLR as the POST BODY - we use application/octect-stream as default mimetype
-		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, false, $mimetype);
+		return $this->_sendRawPost($this->_extractUrl.$this->_queryDelimiter.$queryString, $data, false, $mimetype);
 	}
 	
 	/**
@@ -1119,7 +1119,7 @@ 
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
 
-		$rawPost = '<optimize waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+		$rawPost = '<optimize waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />';
 
 		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
 	}
@@ -1167,7 +1167,7 @@ 
 
 		if ($method == self::METHOD_GET)
 		{
-			return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
+			return $this->_sendRawGet($this->_searchUrl.$this->_queryDelimiter.$queryString);
 		}
 		else if ($method == self::METHOD_POST)
 		{

Braces +14 added lines, -28 removed lines

@@ -268,8 +268,7 @@ 
 			}
 
 			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
-		}
-		else
+		} else
 		{
 			$queryString = '';
 		}
@@ -309,8 +308,7 @@ 
 		{
 			$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);
@@ -390,8 +388,7 @@ 
 		if (empty($host))
 		{
 			throw new Apache_Solr_InvalidArgumentException('Host parameter is empty');
-		}
-		else
+		} else
 		{
 			$this->_host = $host;
 		}
@@ -427,8 +424,7 @@ 
 		if ($port <= 0)
 		{
 			throw new Apache_Solr_InvalidArgumentException('Port is not a valid port number');
-		}
-		else
+		} else
 		{
 			$this->_port = $port;
 		}
@@ -635,8 +631,7 @@ 
 		if ($solrResponse->getHttpStatus() == 200)
 		{
 			return microtime(true) - $start;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -772,8 +767,7 @@ 
 
 					$xml .= '>' . $multivalue . '</field>';
 				}
-			}
-			else
+			} else
 			{
 				$xml .= '<field name="' . $key . '"';
 
@@ -950,8 +944,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -975,8 +968,7 @@ 
 
 			// 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");
 		}
@@ -1011,8 +1003,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -1074,8 +1065,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -1096,8 +1086,7 @@ 
 
 			// 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");
 		}
@@ -1147,8 +1136,7 @@ 
 				// 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();
 		}
@@ -1168,12 +1156,10 @@ 
 		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");
 		}

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

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

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.

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

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 +9 added lines, -9 removed lines

@@ -48,11 +48,11 @@ 
             case 'index':
 
                 // Add command line arguments.
-                $this->cli_options[] = array ('-doc UID/URL', 'UID or (properly encoded) URL of the document.');
+                $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();
@@ -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) {
 
@@ -116,11 +116,11 @@ 
             case 'reindex':
 
                 // Add command line arguments.
-                $this->cli_options[] = array ('-coll UID', 'UID of the collection.');
+                $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();
@@ -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) {
 
@@ -213,7 +213,7 @@ 
     public function __construct() {
 
         // Set basic information about the script.
-        $this->cli_help = array (
+        $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.',