Erikmitk / kitodo-presentation

lib/SolrPhpClient/Apache/Solr/Response.php

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

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

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/FileGetContents.php

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