kitodo / kitodo-presentation

dlf/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");
 		}

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

Braces +4 added lines, -8 removed lines

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

dlf/lib/SolrPhpClient/Apache/Solr/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);

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

dlf/common/class.tx_dlf_document.php

Indentation +1 added lines, -1 removed lines

@@ -1304,7 +1304,7 @@
 			if (TYPO3_DLOG) {
 
 				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'),
-									       self::$extKey, SYSLOG_SEVERITY_ERROR);
+										   self::$extKey, SYSLOG_SEVERITY_ERROR);
 
 			}
 

Spacing +55 added lines, -55 removed lines

@@ -43,7 +43,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $dmdSec = array ();
+	protected $dmdSec = array();
 
 	/**
 	 * Are the METS file's dmdSecs loaded?
@@ -69,7 +69,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $fileGrps = array ();
+	protected $fileGrps = array();
 
 	/**
 	 * Are the file groups loaded?
@@ -87,12 +87,12 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $formats = array (
-		'METS' => array (
+	protected $formats = array(
+		'METS' => array(
 			'rootElement' => 'mets',
 			'namespaceURI' => 'http://www.loc.gov/METS/',
 		),
-		'XLINK' => array (
+		'XLINK' => array(
 			'rootElement' => 'xlink',
 			'namespaceURI' => 'http://www.w3.org/1999/xlink',
 		)
@@ -129,7 +129,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $logicalUnits = array ();
+	protected $logicalUnits = array();
 
 	/**
 	 * This holds the documents' parsed metadata array with their corresponding structMap//div's ID as array key
@@ -137,7 +137,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $metadataArray = array ();
+	protected $metadataArray = array();
 
 	/**
 	 * Is the metadata array loaded?
@@ -178,7 +178,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $physicalStructure = array ();
+	protected $physicalStructure = array();
 
 	/**
 	 * This holds the physical structure metadata
@@ -186,7 +186,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $physicalStructureInfo = array ();
+	protected $physicalStructureInfo = array();
 
 	/**
 	 * Is the physical structure loaded?
@@ -227,7 +227,7 @@ 
 	 * @var	array (tx_dlf_document)
 	 * @access protected
 	 */
-	protected static $registry = array ();
+	protected static $registry = array();
 
 	/**
 	 * This holds the UID of the root document or zero if not multi-volumed
@@ -252,7 +252,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $smLinks = array ('l2p' => array (), 'p2l' => array ());
+	protected $smLinks = array('l2p' => array(), 'p2l' => array());
 
 	/**
 	 * Are the smLinks loaded?
@@ -269,7 +269,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $tableOfContents = array ();
+	protected $tableOfContents = array();
 
 	/**
 	 * Is the table of contents loaded?
@@ -331,7 +331,7 @@ 
 	public static function clearRegistry() {
 
 		// Reset registry array.
-		self::$registry = array ();
+		self::$registry = array();
 
 	}
 
@@ -489,7 +489,7 @@ 
 	 */
 	public function getLogicalStructure($id, $recursive = FALSE) {
 
-		$details = array ();
+		$details = array();
 
 		// Is the requested logical unit already loaded?
 		if (!$recursive && !empty($this->logicalUnits[$id])) {
@@ -556,11 +556,11 @@ 
 		$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
 		// Extract identity information.
-		$details = array ();
+		$details = array();
 
 		$details['id'] = $attributes['ID'];
 
-		$details['dmdId'] = (isset($attributes['DMDID']) ?  $attributes['DMDID'] : '');
+		$details['dmdId'] = (isset($attributes['DMDID']) ? $attributes['DMDID'] : '');
 
 		$details['label'] = (isset($attributes['LABEL']) ? $attributes['LABEL'] : '');
 
@@ -633,7 +633,7 @@ 
 		}
 
 		// Get the files this structure element is pointing at.
-		$details['files'] = array ();
+		$details['files'] = array();
 
 		$fileUse = $this->_getFileGrps();
 
@@ -655,7 +655,7 @@ 
 		// Walk the structure recursively? And are there any children of the current element?
 		if ($recursive && count($structure->children('http://www.loc.gov/METS/')->div)) {
 
-			$details['children'] = array ();
+			$details['children'] = array();
 
 			foreach ($structure->children('http://www.loc.gov/METS/')->div as $child) {
 
@@ -703,7 +703,7 @@ 
 
 			}
 
-			return array ();
+			return array();
 
 		}
 
@@ -715,23 +715,23 @@ 
 		}
 
 		// Initialize metadata array with empty values.
-		$metadata = array (
-			'title' => array (),
-			'title_sorting' => array (),
-			'author' => array (),
-			'place' => array (),
-			'year' => array (),
-			'prod_id' => array (),
-			'record_id' => array (),
-			'opac_id' => array (),
-			'union_id' => array (),
-			'urn' => array (),
-			'purl' => array (),
-			'type' => array (),
-			'volume' => array (),
-			'volume_sorting' => array (),
-			'collection' => array (),
-			'owner' => array (),
+		$metadata = array(
+			'title' => array(),
+			'title_sorting' => array(),
+			'author' => array(),
+			'place' => array(),
+			'year' => array(),
+			'prod_id' => array(),
+			'record_id' => array(),
+			'opac_id' => array(),
+			'union_id' => array(),
+			'urn' => array(),
+			'purl' => array(),
+			'type' => array(),
+			'volume' => array(),
+			'volume_sorting' => array(),
+			'collection' => array(),
+			'owner' => array(),
 		);
 
 		// Get the logical structure node's DMDID.
@@ -786,20 +786,20 @@ 
 
 				}
 
-				return array ();
+				return array();
 
 			}
 
 			// Get the structure's type.
 			if (!empty($this->logicalUnits[$id])) {
 
-				$metadata['type'] = array ($this->logicalUnits[$id]['type']);
+				$metadata['type'] = array($this->logicalUnits[$id]['type']);
 
 			} else {
 
 				$struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
 
-				$metadata['type'] = array ((string) $struct[0]);
+				$metadata['type'] = array((string) $struct[0]);
 
 			}
 
@@ -828,7 +828,7 @@ 
 
 					if ($values instanceof DOMNodeList && $values->length > 0) {
 
-						$metadata[$resArray['index_name']] = array ();
+						$metadata[$resArray['index_name']] = array();
 
 						foreach ($values as $value) {
 
@@ -838,7 +838,7 @@ 
 
 					} elseif (!($values instanceof DOMNodeList)) {
 
-						$metadata[$resArray['index_name']] = array (trim((string) $values));
+						$metadata[$resArray['index_name']] = array(trim((string) $values));
 
 					}
 
@@ -847,7 +847,7 @@ 
 				// Set default value if applicable.
 				if (empty($metadata[$resArray['index_name']][0]) && $resArray['default_value']) {
 
-					$metadata[$resArray['index_name']] = array ($resArray['default_value']);
+					$metadata[$resArray['index_name']] = array($resArray['default_value']);
 
 				}
 
@@ -890,7 +890,7 @@ 
 		} else {
 
 			// There is no dmdSec for this structure node.
-			return array ();
+			return array();
 
 		}
 
@@ -1120,7 +1120,7 @@ 
 			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 				// Update format registry.
-				$this->formats[$resArray['type']] = array (
+				$this->formats[$resArray['type']] = array(
 					'rootElement' => $resArray['root'],
 					'namespaceURI' => $resArray['namespace'],
 					'class' => $resArray['class']
@@ -1303,7 +1303,7 @@ 
 
 			if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'),
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type '.$GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'),
 									       self::$extKey, SYSLOG_SEVERITY_ERROR);
 
 			}
@@ -1315,7 +1315,7 @@ 
 		$metadata['type'][0] = $structure;
 
 		// Get UIDs for collections.
-		$collections = array ();
+		$collections = array();
 
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.uid AS uid',
@@ -1346,7 +1346,7 @@ 
 				// Insert new collection.
 				$collNewUid = uniqid('NEW');
 
-				$collData['tx_dlf_collections'][$collNewUid] = array (
+				$collData['tx_dlf_collections'][$collNewUid] = array(
 					'pid' => $pid,
 					'label' => $collection,
 					'index_name' => $collection,
@@ -1422,7 +1422,7 @@ 
 			// Insert new library.
 			$libNewUid = uniqid('NEW');
 
-			$libData['tx_dlf_libraries'][$libNewUid] = array (
+			$libData['tx_dlf_libraries'][$libNewUid] = array(
 				'pid' => $pid,
 				'label' => $metadata['owner'][0],
 				'index_name' => $metadata['owner'][0],
@@ -1472,7 +1472,7 @@ 
 
 			if ($parentLocation != $this->location) {
 
-				$parentDoc =& tx_dlf_document::getInstance($parentLocation, $pid);
+				$parentDoc = & tx_dlf_document::getInstance($parentLocation, $pid);
 
 				if ($parentDoc->ready) {
 
@@ -1526,9 +1526,9 @@ 
 		}
 
 		// Get metadata for lists and sorting.
-		$listed = array ();
+		$listed = array();
 
-		$sortable = array ();
+		$sortable = array();
 
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable',
@@ -1560,7 +1560,7 @@ 
 		}
 
 		// Fill data array.
-		$data['tx_dlf_documents'][$this->uid] = array (
+		$data['tx_dlf_documents'][$this->uid] = array(
 			'pid' => $pid,
 			$GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['starttime'] => 0,
 			$GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['endtime'] => 0,
@@ -1843,7 +1843,7 @@ 
 
 			}
 
-			return array ();
+			return array();
 
 		}
 
@@ -2386,7 +2386,7 @@ 
 					$hookObjects = tx_dlf_helper::getHookObjects('common/class.tx_dlf_document.php');
 
 					// Apply hooks.
-					foreach($hookObjects as $hookObj) {
+					foreach ($hookObjects as $hookObj) {
 
 						if (method_exists($hookObj, 'construct_postProcessRecordId')) {
 
@@ -2565,7 +2565,7 @@ 
 		// SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization
 		$this->asXML = $this->xml->asXML();
 
-		return array ('uid', 'pid', 'recordId', 'parentId', 'asXML');
+		return array('uid', 'pid', 'recordId', 'parentId', 'asXML');
 
 	}