kitodo / kitodo-presentation

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

Indentation +278 added lines, -278 removed lines

@@ -57,311 +57,311 @@
  */
 class Apache_Solr_Document implements IteratorAggregate
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Document.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Document.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	/**
-	 * Document boost value
-	 *
-	 * @var float
-	 */
-	protected $_documentBoost = false;
+    /**
+     * Document boost value
+     *
+     * @var float
+     */
+    protected $_documentBoost = false;
 
-	/**
-	 * Document field values, indexed by name
-	 *
-	 * @var array
-	 */
-	protected $_fields = array();
+    /**
+     * Document field values, indexed by name
+     *
+     * @var array
+     */
+    protected $_fields = array();
 
-	/**
-	 * Document field boost values, indexed by name
-	 *
-	 * @var array array of floats
-	 */
-	protected $_fieldBoosts = array();
+    /**
+     * Document field boost values, indexed by name
+     *
+     * @var array array of floats
+     */
+    protected $_fieldBoosts = array();
 
-	/**
-	 * Clear all boosts and fields from this document
-	 */
-	public function clear()
-	{
-		$this->_documentBoost = false;
+    /**
+     * Clear all boosts and fields from this document
+     */
+    public function clear()
+    {
+        $this->_documentBoost = false;
 
-		$this->_fields = array();
-		$this->_fieldBoosts = array();
-	}
+        $this->_fields = array();
+        $this->_fieldBoosts = array();
+    }
 
-	/**
-	 * Get current document boost
-	 *
-	 * @return mixed will be false for default, or else a float
-	 */
-	public function getBoost()
-	{
-		return $this->_documentBoost;
-	}
+    /**
+     * Get current document boost
+     *
+     * @return mixed will be false for default, or else a float
+     */
+    public function getBoost()
+    {
+        return $this->_documentBoost;
+    }
 
-	/**
-	 * Set document boost factor
-	 *
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setBoost($boost)
-	{
-		$boost = (float) $boost;
+    /**
+     * Set document boost factor
+     *
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setBoost($boost)
+    {
+        $boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
-			$this->_documentBoost = $boost;
-		}
-		else
-		{
-			$this->_documentBoost = false;
-		}
-	}
+        if ($boost > 0.0)
+        {
+            $this->_documentBoost = $boost;
+        }
+        else
+        {
+            $this->_documentBoost = false;
+        }
+    }
 
-	/**
-	 * Add a value to a multi-valued field
-	 *
-	 * NOTE: the solr XML format allows you to specify boosts
-	 * PER value even though the underlying Lucene implementation
-	 * only allows a boost per field. To remedy this, the final
-	 * field boost value will be the product of all specified boosts
-	 * on field values - this is similar to SolrJ's functionality.
-	 *
-	 * <code>
-	 * $doc = new Apache_Solr_Document();
-	 *
-	 * $doc->addField('foo', 'bar', 2.0);
-	 * $doc->addField('foo', 'baz', 3.0);
-	 *
-	 * // resultant field boost will be 6!
-	 * echo $doc->getFieldBoost('foo');
-	 * </code>
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function addField($key, $value, $boost = false)
-	{
-		if (!isset($this->_fields[$key]))
-		{
-			// create holding array if this is the first value
-			$this->_fields[$key] = array();
-		}
-		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]);
-		}
+    /**
+     * Add a value to a multi-valued field
+     *
+     * NOTE: the solr XML format allows you to specify boosts
+     * PER value even though the underlying Lucene implementation
+     * only allows a boost per field. To remedy this, the final
+     * field boost value will be the product of all specified boosts
+     * on field values - this is similar to SolrJ's functionality.
+     *
+     * <code>
+     * $doc = new Apache_Solr_Document();
+     *
+     * $doc->addField('foo', 'bar', 2.0);
+     * $doc->addField('foo', 'baz', 3.0);
+     *
+     * // resultant field boost will be 6!
+     * echo $doc->getFieldBoost('foo');
+     * </code>
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function addField($key, $value, $boost = false)
+    {
+        if (!isset($this->_fields[$key]))
+        {
+            // create holding array if this is the first value
+            $this->_fields[$key] = array();
+        }
+        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]);
+        }
 
-		if ($this->getFieldBoost($key) === false)
-		{
-			// boost not already set, set it now
-			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
-		{
-			// multiply passed boost with current field boost - similar to SolrJ implementation
-			$this->_fieldBoosts[$key] *= (float) $boost;
-		}
+        if ($this->getFieldBoost($key) === false)
+        {
+            // boost not already set, set it now
+            $this->setFieldBoost($key, $boost);
+        }
+        else if ((float) $boost > 0.0)
+        {
+            // multiply passed boost with current field boost - similar to SolrJ implementation
+            $this->_fieldBoosts[$key] *= (float) $boost;
+        }
 
-		// add value to array
-		$this->_fields[$key][] = $value;
-	}
+        // add value to array
+        $this->_fields[$key][] = $value;
+    }
 
-	/**
-	 * Handle the array manipulation for a multi-valued field
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 *
-	 * @deprecated Use addField(...) instead
-	 */
-	public function setMultiValue($key, $value, $boost = false)
-	{
-		$this->addField($key, $value, $boost);
-	}
+    /**
+     * Handle the array manipulation for a multi-valued field
+     *
+     * @param string $key
+     * @param string $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     *
+     * @deprecated Use addField(...) instead
+     */
+    public function setMultiValue($key, $value, $boost = false)
+    {
+        $this->addField($key, $value, $boost);
+    }
 
-	/**
-	 * Get field information
-	 *
-	 * @param string $key
-	 * @return mixed associative array of info if field exists, false otherwise
-	 */
-	public function getField($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
-			return array(
-				'name' => $key,
-				'value' => $this->_fields[$key],
-				'boost' => $this->getFieldBoost($key)
-			);
-		}
+    /**
+     * Get field information
+     *
+     * @param string $key
+     * @return mixed associative array of info if field exists, false otherwise
+     */
+    public function getField($key)
+    {
+        if (isset($this->_fields[$key]))
+        {
+            return array(
+                'name' => $key,
+                'value' => $this->_fields[$key],
+                'boost' => $this->getFieldBoost($key)
+            );
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Set a field value. Multi-valued fields should be set as arrays
-	 * or instead use the addField(...) function which will automatically
-	 * make sure the field is an array.
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setField($key, $value, $boost = false)
-	{
-		$this->_fields[$key] = $value;
-		$this->setFieldBoost($key, $boost);
-	}
+    /**
+     * Set a field value. Multi-valued fields should be set as arrays
+     * or instead use the addField(...) function which will automatically
+     * make sure the field is an array.
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setField($key, $value, $boost = false)
+    {
+        $this->_fields[$key] = $value;
+        $this->setFieldBoost($key, $boost);
+    }
 
-	/**
-	 * Get the currently set field boost for a document field
-	 *
-	 * @param string $key
-	 * @return float currently set field boost, false if one is not set
-	 */
-	public function getFieldBoost($key)
-	{
-		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
-	}
+    /**
+     * Get the currently set field boost for a document field
+     *
+     * @param string $key
+     * @return float currently set field boost, false if one is not set
+     */
+    public function getFieldBoost($key)
+    {
+        return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
+    }
 
-	/**
-	 * Set the field boost for a document field
-	 *
-	 * @param string $key field name for the boost
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setFieldBoost($key, $boost)
-	{
-		$boost = (float) $boost;
+    /**
+     * Set the field boost for a document field
+     *
+     * @param string $key field name for the boost
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setFieldBoost($key, $boost)
+    {
+        $boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
-			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
-		{
-			$this->_fieldBoosts[$key] = false;
-		}
-	}
+        if ($boost > 0.0)
+        {
+            $this->_fieldBoosts[$key] = $boost;
+        }
+        else
+        {
+            $this->_fieldBoosts[$key] = false;
+        }
+    }
 
-	/**
-	 * Return current field boosts, indexed by field name
-	 *
-	 * @return array
-	 */
-	public function getFieldBoosts()
-	{
-		return $this->_fieldBoosts;
-	}
+    /**
+     * Return current field boosts, indexed by field name
+     *
+     * @return array
+     */
+    public function getFieldBoosts()
+    {
+        return $this->_fieldBoosts;
+    }
 
-	/**
-	 * Get the names of all fields in this document
-	 *
-	 * @return array
-	 */
-	public function getFieldNames()
-	{
-		return array_keys($this->_fields);
-	}
+    /**
+     * Get the names of all fields in this document
+     *
+     * @return array
+     */
+    public function getFieldNames()
+    {
+        return array_keys($this->_fields);
+    }
 
-	/**
-	 * Get the values of all fields in this document
-	 *
-	 * @return array
-	 */
-	public function getFieldValues()
-	{
-		return array_values($this->_fields);
-	}
+    /**
+     * Get the values of all fields in this document
+     *
+     * @return array
+     */
+    public function getFieldValues()
+    {
+        return array_values($this->_fields);
+    }
 
-	/**
-	 * IteratorAggregate implementation function. Allows usage:
-	 *
-	 * <code>
-	 * foreach ($document as $key => $value)
-	 * {
-	 * 	...
-	 * }
-	 * </code>
-	 */
-	public function getIterator()
-	{
-		$arrayObject = new ArrayObject($this->_fields);
+    /**
+     * IteratorAggregate implementation function. Allows usage:
+     *
+     * <code>
+     * foreach ($document as $key => $value)
+     * {
+     * 	...
+     * }
+     * </code>
+     */
+    public function getIterator()
+    {
+        $arrayObject = new ArrayObject($this->_fields);
 
-		return $arrayObject->getIterator();
-	}
+        return $arrayObject->getIterator();
+    }
 
-	/**
-	 * Magic get for field values
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
-			return $this->_fields[$key];
-		}
+    /**
+     * Magic get for field values
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if (isset($this->_fields[$key]))
+        {
+            return $this->_fields[$key];
+        }
 		
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Magic set for field values. Multi-valued fields should be set as arrays
-	 * or instead use the addField(...) function which will automatically
-	 * make sure the field is an array.
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function __set($key, $value)
-	{
-		$this->setField($key, $value);
-	}
+    /**
+     * Magic set for field values. Multi-valued fields should be set as arrays
+     * or instead use the addField(...) function which will automatically
+     * make sure the field is an array.
+     *
+     * @param string $key
+     * @param mixed $value
+     */
+    public function __set($key, $value)
+    {
+        $this->setField($key, $value);
+    }
 
-	/**
-	 * Magic isset for fields values.  Do not call directly. Allows usage:
-	 *
-	 * <code>
-	 * isset($document->some_field);
-	 * </code>
-	 *
-	 * @param string $key
-	 * @return boolean
-	 */
-	public function __isset($key)
-	{
-		return isset($this->_fields[$key]);
-	}
+    /**
+     * Magic isset for fields values.  Do not call directly. Allows usage:
+     *
+     * <code>
+     * isset($document->some_field);
+     * </code>
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function __isset($key)
+    {
+        return isset($this->_fields[$key]);
+    }
 
-	/**
-	 * Magic unset for field values. Do not call directly. Allows usage:
-	 *
-	 * <code>
-	 * unset($document->some_field);
-	 * </code>
-	 *
-	 * @param string $key
-	 */
-	public function __unset($key)
-	{
-		unset($this->_fields[$key]);
-		unset($this->_fieldBoosts[$key]);
-	}
+    /**
+     * Magic unset for field values. Do not call directly. Allows usage:
+     *
+     * <code>
+     * unset($document->some_field);
+     * </code>
+     *
+     * @param string $key
+     */
+    public function __unset($key)
+    {
+        unset($this->_fields[$key]);
+        unset($this->_fieldBoosts[$key]);
+    }
 }
\ No newline at end of file

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

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: InvalidArgumentException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: InvalidArgumentException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file

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

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_NoServiceAvailableException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: NoServiceAvailableException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: NoServiceAvailableException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file

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

Indentation +857 added lines, -857 removed lines

@@ -50,865 +50,865 @@
  */
 class Apache_Solr_Service_Balancer
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Balancer.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
-
-	protected $_createDocuments = true;
-
-	protected $_readableServices = array();
-	protected $_writeableServices = array();
-
-	protected $_currentReadService = null;
-	protected $_currentWriteService = null;
-
-	protected $_readPingTimeout = 2;
-	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
-
-	/**
-	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
-	 *
-	 * NOTE: inside a phrase fewer characters need escaped, use {@link Apache_Solr_Service::escapePhrase()} instead
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function escape($value)
-	{
-		return Apache_Solr_Service::escape($value);
-	}
-
-	/**
-	 * Escape a value meant to be contained in a phrase for special query characters
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function escapePhrase($value)
-	{
-		return Apache_Solr_Service::escapePhrase($value);
-	}
-
-	/**
-	 * Convenience function for creating phrase syntax from a value
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function phrase($value)
-	{
-		return Apache_Solr_Service::phrase($value);
-	}
-
-	/**
-	 * Constructor. Takes arrays of read and write service instances or descriptions
-	 *
-	 * @param array $readableServices
-	 * @param array $writeableServices
-	 */
-	public function __construct($readableServices = array(), $writeableServices = array())
-	{
-		//setup readable services
-		foreach ($readableServices as $service)
-		{
-			$this->addReadService($service);
-		}
-
-		//setup writeable services
-		foreach ($writeableServices as $service)
-		{
-			$this->addWriteService($service);
-		}
-	}
-
-	public function setReadPingTimeout($timeout)
-	{
-		$this->_readPingTimeout = $timeout;
-	}
-
-	public function setWritePingTimeout($timeout)
-	{
-		$this->_writePingTimeout = $timeout;
-	}
-
-	public function setUseBackoff($enable)
-	{
-		$this->_useBackoff = $enable;
-	}
-
-	/**
-	 * Generates a service ID
-	 *
-	 * @param string $host
-	 * @param integer $port
-	 * @param string $path
-	 * @return string
-	 */
-	protected function _getServiceId($host, $port, $path)
-	{
-		return $host . ':' . $port . $path;
-	}
-
-	/**
-	 * Adds a service instance or service descriptor (if it is already
-	 * not added)
-	 *
-	 * @param mixed $service
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
-	 */
-	public function addReadService($service)
-	{
-		if ($service instanceof Apache_Solr_Service)
-		{
-			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-
-			$this->_readableServices[$id] = $service;
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-
-				$this->_readableServices[$id] = $service;
-			}
-			else
-			{
-				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
-			}
-		}
-	}
-
-	/**
-	 * Removes a service instance or descriptor from the available services
-	 *
-	 * @param mixed $service
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
-	 */
-	public function removeReadService($service)
-	{
-		$id = '';
-
-		if ($service instanceof Apache_Solr_Service)
-		{
-			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			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))
-		{
-			$id = $service;
-		}
-
-		if ($id && isset($this->_readableServices[$id]))
-		{
-			unset($this->_readableServices[$id]);
-		}
-	}
-
-	/**
-	 * Adds a service instance or service descriptor (if it is already
-	 * not added)
-	 *
-	 * @param mixed $service
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
-	 */
-	public function addWriteService($service)
-	{
-		if ($service instanceof Apache_Solr_Service)
-		{
-			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-
-			$this->_writeableServices[$id] = $service;
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-
-				$this->_writeableServices[$id] = $service;
-			}
-			else
-			{
-				throw new Apache_Solr_InvalidArgumentException('A Writeable Service description array does not have all required elements of host, port, and path');
-			}
-		}
-	}
-
-	/**
-	 * Removes a service instance or descriptor from the available services
-	 *
-	 * @param mixed $service
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
-	 */
-	public function removeWriteService($service)
-	{
-		$id = '';
-
-		if ($service instanceof Apache_Solr_Service)
-		{
-			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
-		{
-			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
-			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			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))
-		{
-			$id = $service;
-		}
-
-		if ($id && isset($this->_writeableServices[$id]))
-		{
-			unset($this->_writeableServices[$id]);
-		}
-	}
-
-	/**
-	 * Iterate through available read services and select the first with a ping
-	 * that satisfies configured timeout restrictions (or the default)
-	 *
-	 * @return Apache_Solr_Service
-	 *
-	 * @throws Apache_Solr_NoServiceAvailableException If there are no read services that meet requirements
-	 */
-	protected function _selectReadService($forceSelect = false)
-	{
-		if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect)
-		{
-			if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect)
-			{
-				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false)
-				{
-					$this->removeReadService($this->_currentReadService);
-				}
-			}
-
-			if (count($this->_readableServices))
-			{
-				// select one of the read services at random
-				$ids = array_keys($this->_readableServices);
-
-				$id = $ids[rand(0, count($ids) - 1)];
-				$service = $this->_readableServices[$id];
-
-				if (is_array($service))
-				{
-					//convert the array definition to a client object
-					$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
-					$this->_readableServices[$id] = $service;
-				}
-
-				$service->setCreateDocuments($this->_createDocuments);
-				$this->_currentReadService = $id;
-			}
-			else
-			{
-				throw new Apache_Solr_NoServiceAvailableException('No read services were available');
-			}
-		}
-
-		return $this->_readableServices[$this->_currentReadService];
-	}
-
-	/**
-	 * Iterate through available write services and select the first with a ping
-	 * that satisfies configured timeout restrictions (or the default)
-	 *
-	 * @return Apache_Solr_Service
-	 *
-	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
-	 */
-	protected function _selectWriteService($forceSelect = false)
-	{
-		if($this->_useBackoff)
-		{
-			return $this->_selectWriteServiceSafe($forceSelect);
-		}
-
-		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
-		{
-			if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect)
-			{
-				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false)
-				{
-					$this->removeWriteService($this->_currentWriteService);
-				}
-			}
-
-			if (count($this->_writeableServices))
-			{
-				// select one of the read services at random
-				$ids = array_keys($this->_writeableServices);
-
-				$id = $ids[rand(0, count($ids) - 1)];
-				$service = $this->_writeableServices[$id];
-
-				if (is_array($service))
-				{
-					//convert the array definition to a client object
-					$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
-					$this->_writeableServices[$id] = $service;
-				}
-
-				$this->_currentWriteService = $id;
-			}
-			else
-			{
-				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
-			}
-		}
-
-		return $this->_writeableServices[$this->_currentWriteService];
-	}
-
-	/**
-	 * Iterate through available write services and select the first with a ping
-	 * that satisfies configured timeout restrictions (or the default).  The
-	 * timeout period will increase until a connection is made or the limit is
-	 * reached.   This will allow for increased reliability with heavily loaded
-	 * server(s).
-	 *
-	 * @return Apache_Solr_Service
-	 *
-	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
-	 */
-
-	protected function _selectWriteServiceSafe($forceSelect = false)
-	{
-		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
-		{
-			if (count($this->_writeableServices))
-			{
-				$backoff = $this->_defaultBackoff;
-
-				do {
-					// select one of the read services at random
-					$ids = array_keys($this->_writeableServices);
-
-					$id = $ids[rand(0, count($ids) - 1)];
-					$service = $this->_writeableServices[$id];
-
-					if (is_array($service))
-					{
-						//convert the array definition to a client object
-						$service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
-						$this->_writeableServices[$id] = $service;
-					}
-
-					$this->_currentWriteService = $id;
-
-					$backoff *= $this->_backoffEscalation;
-
-					if($backoff > $this->_backoffLimit)
-					{
-						throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
-					}
-
-				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
-			}
-			else
-			{
-				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
-			}
-		}
-
-		return $this->_writeableServices[$this->_currentWriteService];
-	}
-
-	/**
-	 * Set the create documents flag. This determines whether {@link Apache_Solr_Response} objects will
-	 * parse the response and create {@link Apache_Solr_Document} instances in place.
-	 *
-	 * @param boolean $createDocuments
-	 */
-	public function setCreateDocuments($createDocuments)
-	{
-		$this->_createDocuments = (bool) $createDocuments;
-
-		// set on current read service
-		if ($this->_currentReadService)
-		{
-			$service = $this->_selectReadService();
-			$service->setCreateDocuments($createDocuments);
-		}
-	}
-
-	/**
-	 * Get the current state of the create documents flag.
-	 *
-	 * @return boolean
-	 */
-	public function getCreateDocuments()
-	{
-		return $this->_createDocuments;
-	}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Balancer.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+
+    protected $_createDocuments = true;
+
+    protected $_readableServices = array();
+    protected $_writeableServices = array();
+
+    protected $_currentReadService = null;
+    protected $_currentWriteService = null;
+
+    protected $_readPingTimeout = 2;
+    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
+
+    /**
+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
+     *
+     * NOTE: inside a phrase fewer characters need escaped, use {@link Apache_Solr_Service::escapePhrase()} instead
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function escape($value)
+    {
+        return Apache_Solr_Service::escape($value);
+    }
+
+    /**
+     * Escape a value meant to be contained in a phrase for special query characters
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function escapePhrase($value)
+    {
+        return Apache_Solr_Service::escapePhrase($value);
+    }
+
+    /**
+     * Convenience function for creating phrase syntax from a value
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function phrase($value)
+    {
+        return Apache_Solr_Service::phrase($value);
+    }
+
+    /**
+     * Constructor. Takes arrays of read and write service instances or descriptions
+     *
+     * @param array $readableServices
+     * @param array $writeableServices
+     */
+    public function __construct($readableServices = array(), $writeableServices = array())
+    {
+        //setup readable services
+        foreach ($readableServices as $service)
+        {
+            $this->addReadService($service);
+        }
+
+        //setup writeable services
+        foreach ($writeableServices as $service)
+        {
+            $this->addWriteService($service);
+        }
+    }
+
+    public function setReadPingTimeout($timeout)
+    {
+        $this->_readPingTimeout = $timeout;
+    }
+
+    public function setWritePingTimeout($timeout)
+    {
+        $this->_writePingTimeout = $timeout;
+    }
+
+    public function setUseBackoff($enable)
+    {
+        $this->_useBackoff = $enable;
+    }
+
+    /**
+     * Generates a service ID
+     *
+     * @param string $host
+     * @param integer $port
+     * @param string $path
+     * @return string
+     */
+    protected function _getServiceId($host, $port, $path)
+    {
+        return $host . ':' . $port . $path;
+    }
+
+    /**
+     * Adds a service instance or service descriptor (if it is already
+     * not added)
+     *
+     * @param mixed $service
+     *
+     * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
+     */
+    public function addReadService($service)
+    {
+        if ($service instanceof Apache_Solr_Service)
+        {
+            $id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
+
+            $this->_readableServices[$id] = $service;
+        }
+        else if (is_array($service))
+        {
+            if (isset($service['host']) && isset($service['port']) && isset($service['path']))
+            {
+                $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+
+                $this->_readableServices[$id] = $service;
+            }
+            else
+            {
+                throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
+            }
+        }
+    }
+
+    /**
+     * Removes a service instance or descriptor from the available services
+     *
+     * @param mixed $service
+     *
+     * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
+     */
+    public function removeReadService($service)
+    {
+        $id = '';
+
+        if ($service instanceof Apache_Solr_Service)
+        {
+            $id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
+        }
+        else if (is_array($service))
+        {
+            if (isset($service['host']) && isset($service['port']) && isset($service['path']))
+            {
+                $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+            }
+            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))
+        {
+            $id = $service;
+        }
+
+        if ($id && isset($this->_readableServices[$id]))
+        {
+            unset($this->_readableServices[$id]);
+        }
+    }
+
+    /**
+     * Adds a service instance or service descriptor (if it is already
+     * not added)
+     *
+     * @param mixed $service
+     *
+     * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
+     */
+    public function addWriteService($service)
+    {
+        if ($service instanceof Apache_Solr_Service)
+        {
+            $id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
+
+            $this->_writeableServices[$id] = $service;
+        }
+        else if (is_array($service))
+        {
+            if (isset($service['host']) && isset($service['port']) && isset($service['path']))
+            {
+                $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+
+                $this->_writeableServices[$id] = $service;
+            }
+            else
+            {
+                throw new Apache_Solr_InvalidArgumentException('A Writeable Service description array does not have all required elements of host, port, and path');
+            }
+        }
+    }
+
+    /**
+     * Removes a service instance or descriptor from the available services
+     *
+     * @param mixed $service
+     *
+     * @throws Apache_Solr_InvalidArgumentException If service descriptor is not valid
+     */
+    public function removeWriteService($service)
+    {
+        $id = '';
+
+        if ($service instanceof Apache_Solr_Service)
+        {
+            $id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
+        }
+        else if (is_array($service))
+        {
+            if (isset($service['host']) && isset($service['port']) && isset($service['path']))
+            {
+                $id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+            }
+            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))
+        {
+            $id = $service;
+        }
+
+        if ($id && isset($this->_writeableServices[$id]))
+        {
+            unset($this->_writeableServices[$id]);
+        }
+    }
+
+    /**
+     * Iterate through available read services and select the first with a ping
+     * that satisfies configured timeout restrictions (or the default)
+     *
+     * @return Apache_Solr_Service
+     *
+     * @throws Apache_Solr_NoServiceAvailableException If there are no read services that meet requirements
+     */
+    protected function _selectReadService($forceSelect = false)
+    {
+        if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect)
+        {
+            if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect)
+            {
+                // we probably had a communication error, ping the current read service, remove it if it times out
+                if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false)
+                {
+                    $this->removeReadService($this->_currentReadService);
+                }
+            }
+
+            if (count($this->_readableServices))
+            {
+                // select one of the read services at random
+                $ids = array_keys($this->_readableServices);
+
+                $id = $ids[rand(0, count($ids) - 1)];
+                $service = $this->_readableServices[$id];
+
+                if (is_array($service))
+                {
+                    //convert the array definition to a client object
+                    $service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
+                    $this->_readableServices[$id] = $service;
+                }
+
+                $service->setCreateDocuments($this->_createDocuments);
+                $this->_currentReadService = $id;
+            }
+            else
+            {
+                throw new Apache_Solr_NoServiceAvailableException('No read services were available');
+            }
+        }
+
+        return $this->_readableServices[$this->_currentReadService];
+    }
+
+    /**
+     * Iterate through available write services and select the first with a ping
+     * that satisfies configured timeout restrictions (or the default)
+     *
+     * @return Apache_Solr_Service
+     *
+     * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
+     */
+    protected function _selectWriteService($forceSelect = false)
+    {
+        if($this->_useBackoff)
+        {
+            return $this->_selectWriteServiceSafe($forceSelect);
+        }
+
+        if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
+        {
+            if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect)
+            {
+                // we probably had a communication error, ping the current read service, remove it if it times out
+                if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false)
+                {
+                    $this->removeWriteService($this->_currentWriteService);
+                }
+            }
+
+            if (count($this->_writeableServices))
+            {
+                // select one of the read services at random
+                $ids = array_keys($this->_writeableServices);
+
+                $id = $ids[rand(0, count($ids) - 1)];
+                $service = $this->_writeableServices[$id];
+
+                if (is_array($service))
+                {
+                    //convert the array definition to a client object
+                    $service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
+                    $this->_writeableServices[$id] = $service;
+                }
+
+                $this->_currentWriteService = $id;
+            }
+            else
+            {
+                throw new Apache_Solr_NoServiceAvailableException('No write services were available');
+            }
+        }
+
+        return $this->_writeableServices[$this->_currentWriteService];
+    }
+
+    /**
+     * Iterate through available write services and select the first with a ping
+     * that satisfies configured timeout restrictions (or the default).  The
+     * timeout period will increase until a connection is made or the limit is
+     * reached.   This will allow for increased reliability with heavily loaded
+     * server(s).
+     *
+     * @return Apache_Solr_Service
+     *
+     * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
+     */
+
+    protected function _selectWriteServiceSafe($forceSelect = false)
+    {
+        if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
+        {
+            if (count($this->_writeableServices))
+            {
+                $backoff = $this->_defaultBackoff;
+
+                do {
+                    // select one of the read services at random
+                    $ids = array_keys($this->_writeableServices);
+
+                    $id = $ids[rand(0, count($ids) - 1)];
+                    $service = $this->_writeableServices[$id];
+
+                    if (is_array($service))
+                    {
+                        //convert the array definition to a client object
+                        $service = new Apache_Solr_Service($service['host'], $service['port'], $service['path']);
+                        $this->_writeableServices[$id] = $service;
+                    }
+
+                    $this->_currentWriteService = $id;
+
+                    $backoff *= $this->_backoffEscalation;
+
+                    if($backoff > $this->_backoffLimit)
+                    {
+                        throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
+                    }
+
+                } while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
+            }
+            else
+            {
+                throw new Apache_Solr_NoServiceAvailableException('No write services were available');
+            }
+        }
+
+        return $this->_writeableServices[$this->_currentWriteService];
+    }
+
+    /**
+     * Set the create documents flag. This determines whether {@link Apache_Solr_Response} objects will
+     * parse the response and create {@link Apache_Solr_Document} instances in place.
+     *
+     * @param boolean $createDocuments
+     */
+    public function setCreateDocuments($createDocuments)
+    {
+        $this->_createDocuments = (bool) $createDocuments;
+
+        // set on current read service
+        if ($this->_currentReadService)
+        {
+            $service = $this->_selectReadService();
+            $service->setCreateDocuments($createDocuments);
+        }
+    }
+
+    /**
+     * Get the current state of the create documents flag.
+     *
+     * @return boolean
+     */
+    public function getCreateDocuments()
+    {
+        return $this->_createDocuments;
+    }
 	
-	/**
-	 * Raw Add Method. Takes a raw post body and sends it to the update service.  Post body
-	 * should be a complete and well formed "add" xml document.
-	 *
-	 * @param string $rawPost
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function add($rawPost)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->add($rawPost);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Add a Solr Document to the index
-	 *
-	 * @param Apache_Solr_Document $document
-	 * @param boolean $allowDups
-	 * @param boolean $overwritePending
-	 * @param boolean $overwriteCommitted
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->addDocument($document, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Add an array of Solr Documents to the index all at once
-	 *
-	 * @param array $documents Should be an array of Apache_Solr_Document instances
-	 * @param boolean $allowDups
-	 * @param boolean $overwritePending
-	 * @param boolean $overwriteCommitted
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->addDocuments($documents, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Send a commit command.  Will be synchronous unless both wait parameters are set
-	 * to false.
-	 *
-	 * @param boolean $waitFlush
-	 * @param boolean $waitSearcher
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->commit($optimize, $waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Raw Delete Method. Takes a raw post body and sends it to the update service. Body should be
-	 * a complete and well formed "delete" xml document
-	 *
-	 * @param string $rawPost
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function delete($rawPost, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->delete($rawPost, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Create a delete document based on document ID
-	 *
-	 * @param string $id
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->deleteById($id, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Create and post a delete document based on multiple document IDs.
-	 *
-	 * @param array $ids Expected to be utf-8 encoded strings
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->deleteByMultipleId($ids, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Create a delete document based on a query and submit it
-	 *
-	 * @param string $rawQuery
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->deleteByQuery($rawQuery, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
+    /**
+     * Raw Add Method. Takes a raw post body and sends it to the update service.  Post body
+     * should be a complete and well formed "add" xml document.
+     *
+     * @param string $rawPost
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function add($rawPost)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->add($rawPost);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Add a Solr Document to the index
+     *
+     * @param Apache_Solr_Document $document
+     * @param boolean $allowDups
+     * @param boolean $overwritePending
+     * @param boolean $overwriteCommitted
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->addDocument($document, $allowDups, $overwritePending, $overwriteCommitted);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Add an array of Solr Documents to the index all at once
+     *
+     * @param array $documents Should be an array of Apache_Solr_Document instances
+     * @param boolean $allowDups
+     * @param boolean $overwritePending
+     * @param boolean $overwriteCommitted
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->addDocuments($documents, $allowDups, $overwritePending, $overwriteCommitted);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Send a commit command.  Will be synchronous unless both wait parameters are set
+     * to false.
+     *
+     * @param boolean $waitFlush
+     * @param boolean $waitSearcher
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->commit($optimize, $waitFlush, $waitSearcher, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Raw Delete Method. Takes a raw post body and sends it to the update service. Body should be
+     * a complete and well formed "delete" xml document
+     *
+     * @param string $rawPost
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function delete($rawPost, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->delete($rawPost, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Create a delete document based on document ID
+     *
+     * @param string $id
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->deleteById($id, $fromPending, $fromCommitted, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Create and post a delete document based on multiple document IDs.
+     *
+     * @param array $ids Expected to be utf-8 encoded strings
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->deleteByMultipleId($ids, $fromPending, $fromCommitted, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Create a delete document based on a query and submit it
+     *
+     * @param string $rawQuery
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->deleteByQuery($rawQuery, $fromPending, $fromCommitted, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
 	
-	/**
-	 * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
-	 * to use Solr Cell and what parameters are available.
-	 *
-	 * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
-	 * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
-	 * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
-	 * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
-	 *
-	 * @param string $file Path to file to extract data from
-	 * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
-	 * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
-	 * @param string $mimetype optional mimetype specification (for the file being extracted)
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
-	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->extract($file, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
+    /**
+     * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
+     * to use Solr Cell and what parameters are available.
+     *
+     * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
+     * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
+     * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
+     * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
+     *
+     * @param string $file Path to file to extract data from
+     * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
+     * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
+     * @param string $mimetype optional mimetype specification (for the file being extracted)
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
+     */
+    public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->extract($file, $params, $document, $mimetype);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
 	
-	/**
-	 * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
-	 * to use Solr Cell and what parameters are available.
-	 *
-	 * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
-	 * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
-	 * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
-	 * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
-	 *
-	 * @param string $data Data that will be passed to Solr Cell
-	 * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
-	 * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
-	 * @param string $mimetype optional mimetype specification (for the file being extracted)
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
-	 *
-	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
-	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->extractFromString($data, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
+    /**
+     * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
+     * to use Solr Cell and what parameters are available.
+     *
+     * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
+     * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
+     * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
+     * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
+     *
+     * @param string $data Data that will be passed to Solr Cell
+     * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
+     * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
+     * @param string $mimetype optional mimetype specification (for the file being extracted)
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
+     *
+     * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
+     */
+    public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->extractFromString($data, $params, $document, $mimetype);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
 	
-	/**
-	 * Send an optimize command.  Will be synchronous unless both wait parameters are set
-	 * to false.
-	 *
-	 * @param boolean $waitFlush
-	 * @param boolean $waitSearcher
-	 * @param float $timeout Maximum expected duration of the optimize operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
-		$service = $this->_selectWriteService();
-
-		do
-		{
-			try
-			{
-				return $service->optimize($waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectWriteService(true);
-		} while ($service);
-
-		return false;
-	}
-
-	/**
-	 * Simple Search interface
-	 *
-	 * @param string $query The raw query string
-	 * @param int $offset The starting offset for result documents
-	 * @param int $limit The maximum number of result documents to return
-	 * @param array $params key / value pairs for query parameters, use arrays for multivalued parameters
-	 * @param string $method The HTTP method (Apache_Solr_Service::METHOD_GET or Apache_Solr_Service::METHOD::POST)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = Apache_Solr_Service::METHOD_GET)
-	{
-		$service = $this->_selectReadService();
-
-		do
-		{
-			try
-			{
-				return $service->search($query, $offset, $limit, $params, $method);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
-			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
-				{
-					throw $e;
-				}
-			}
-
-			$service = $this->_selectReadService(true);
-		} while ($service);
-
-		return false;
-	}
+    /**
+     * Send an optimize command.  Will be synchronous unless both wait parameters are set
+     * to false.
+     *
+     * @param boolean $waitFlush
+     * @param boolean $waitSearcher
+     * @param float $timeout Maximum expected duration of the optimize operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+    {
+        $service = $this->_selectWriteService();
+
+        do
+        {
+            try
+            {
+                return $service->optimize($waitFlush, $waitSearcher, $timeout);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectWriteService(true);
+        } while ($service);
+
+        return false;
+    }
+
+    /**
+     * Simple Search interface
+     *
+     * @param string $query The raw query string
+     * @param int $offset The starting offset for result documents
+     * @param int $limit The maximum number of result documents to return
+     * @param array $params key / value pairs for query parameters, use arrays for multivalued parameters
+     * @param string $method The HTTP method (Apache_Solr_Service::METHOD_GET or Apache_Solr_Service::METHOD::POST)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function search($query, $offset = 0, $limit = 10, $params = array(), $method = Apache_Solr_Service::METHOD_GET)
+    {
+        $service = $this->_selectReadService();
+
+        do
+        {
+            try
+            {
+                return $service->search($query, $offset, $limit, $params, $method);
+            }
+            catch (Apache_Solr_HttpTransportException $e)
+            {
+                if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+                {
+                    throw $e;
+                }
+            }
+
+            $service = $this->_selectReadService(true);
+        } while ($service);
+
+        return false;
+    }
 }

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

Indentation +197 added lines, -197 removed lines

@@ -47,201 +47,201 @@
  */
 class Apache_Solr_Response
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Response.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
-
-	/**
-	 * Holds the raw response used in construction
-	 *
-	 * @var Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	protected $_response;
-
-	/**
-	 * Whether the raw response has been parsed
-	 *
-	 * @var boolean
-	 */
-	protected $_isParsed = false;
-
-	/**
-	 * Parsed representation of the data
-	 *
-	 * @var mixed
-	 */
-	protected $_parsedData;
-
-	/**
-	 * Data parsing flags.  Determines what extra processing should be done
-	 * after the data is initially converted to a data structure.
-	 *
-	 * @var boolean
-	 */
-	protected $_createDocuments = true,
-			$_collapseSingleValueArrays = true;
-
-	/**
-	 * Constructor. Takes the raw HTTP response body and the exploded HTTP headers
-	 *
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 * @param boolean $createDocuments Whether to convert the documents json_decoded as stdClass instances to Apache_Solr_Document instances
-	 * @param boolean $collapseSingleValueArrays Whether to make multivalued fields appear as single values
-	 */
-	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true)
-	{
-		$this->_response = $response;
-		$this->_createDocuments = (bool) $createDocuments;
-		$this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
-	}
-
-	/**
-	 * Get the HTTP status code
-	 *
-	 * @return integer
-	 */
-	public function getHttpStatus()
-	{
-		return $this->_response->getStatusCode();
-	}
-
-	/**
-	 * Get the HTTP status message of the response
-	 *
-	 * @return string
-	 */
-	public function getHttpStatusMessage()
-	{
-		return $this->_response->getStatusMessage();
-	}
-
-	/**
-	 * Get content type of this Solr response
-	 *
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->_response->getMimeType();
-	}
-
-	/**
-	 * Get character encoding of this response. Should usually be utf-8, but just in case
-	 *
-	 * @return string
-	 */
-	public function getEncoding()
-	{
-		return $this->_response->getEncoding();
-	}
-
-	/**
-	 * Get the raw response as it was given to this object
-	 *
-	 * @return string
-	 */
-	public function getRawResponse()
-	{
-		return $this->_response->getBody();
-	}
-
-	/**
-	 * Magic get to expose the parsed data and to lazily load it
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if (!$this->_isParsed)
-		{
-			$this->_parseData();
-			$this->_isParsed = true;
-		}
-
-		if (isset($this->_parsedData->$key))
-		{
-			return $this->_parsedData->$key;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Magic function for isset function on parsed data
-	 *
-	 * @param string $key
-	 * @return boolean
-	 */
-	public function __isset($key)
-	{
-		if (!$this->_isParsed)
-		{
-			$this->_parseData();
-			$this->_isParsed = true;
-		}
-
-		return isset($this->_parsedData->$key);
-	}
-
-	/**
-	 * Parse the raw response into the parsed_data array for access
-	 *
-	 * @throws Apache_Solr_ParserException If the data could not be parsed
-	 */
-	protected function _parseData()
-	{
-		//An alternative would be to use Zend_Json::decode(...)
-		$data = json_decode($this->_response->getBody());
-
-		// check that we receive a valid JSON response - we should never receive a null
-		if ($data === null)
-		{
-			throw new Apache_Solr_ParserException('Solr response does not appear to be valid JSON, please examine the raw response with getRawResponse() method');
-		}
-
-		//if we're configured to collapse single valued arrays or to convert them to Apache_Solr_Document objects
-		//and we have response documents, then try to collapse the values and / or convert them now
-		if (($this->_createDocuments || $this->_collapseSingleValueArrays) && isset($data->response) && is_array($data->response->docs))
-		{
-			$documents = array();
-
-			foreach ($data->response->docs as $originalDocument)
-			{
-				if ($this->_createDocuments)
-				{
-					$document = new Apache_Solr_Document();
-				}
-				else
-				{
-					$document = $originalDocument;
-				}
-
-				foreach ($originalDocument as $key => $value)
-				{
-					//If a result is an array with only a single
-					//value then its nice to be able to access
-					//it as if it were always a single value
-					if ($this->_collapseSingleValueArrays && is_array($value) && count($value) <= 1)
-					{
-						$value = array_shift($value);
-					}
-
-					$document->$key = $value;
-				}
-
-				$documents[] = $document;
-			}
-
-			$data->response->docs = $documents;
-		}
-
-		$this->_parsedData = $data;
-	}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Response.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+
+    /**
+     * Holds the raw response used in construction
+     *
+     * @var Apache_Solr_HttpTransport_Response HTTP response
+     */
+    protected $_response;
+
+    /**
+     * Whether the raw response has been parsed
+     *
+     * @var boolean
+     */
+    protected $_isParsed = false;
+
+    /**
+     * Parsed representation of the data
+     *
+     * @var mixed
+     */
+    protected $_parsedData;
+
+    /**
+     * Data parsing flags.  Determines what extra processing should be done
+     * after the data is initially converted to a data structure.
+     *
+     * @var boolean
+     */
+    protected $_createDocuments = true,
+            $_collapseSingleValueArrays = true;
+
+    /**
+     * Constructor. Takes the raw HTTP response body and the exploded HTTP headers
+     *
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     * @param boolean $createDocuments Whether to convert the documents json_decoded as stdClass instances to Apache_Solr_Document instances
+     * @param boolean $collapseSingleValueArrays Whether to make multivalued fields appear as single values
+     */
+    public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true)
+    {
+        $this->_response = $response;
+        $this->_createDocuments = (bool) $createDocuments;
+        $this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
+    }
+
+    /**
+     * Get the HTTP status code
+     *
+     * @return integer
+     */
+    public function getHttpStatus()
+    {
+        return $this->_response->getStatusCode();
+    }
+
+    /**
+     * Get the HTTP status message of the response
+     *
+     * @return string
+     */
+    public function getHttpStatusMessage()
+    {
+        return $this->_response->getStatusMessage();
+    }
+
+    /**
+     * Get content type of this Solr response
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->_response->getMimeType();
+    }
+
+    /**
+     * Get character encoding of this response. Should usually be utf-8, but just in case
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_response->getEncoding();
+    }
+
+    /**
+     * Get the raw response as it was given to this object
+     *
+     * @return string
+     */
+    public function getRawResponse()
+    {
+        return $this->_response->getBody();
+    }
+
+    /**
+     * Magic get to expose the parsed data and to lazily load it
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if (!$this->_isParsed)
+        {
+            $this->_parseData();
+            $this->_isParsed = true;
+        }
+
+        if (isset($this->_parsedData->$key))
+        {
+            return $this->_parsedData->$key;
+        }
+
+        return null;
+    }
+
+    /**
+     * Magic function for isset function on parsed data
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function __isset($key)
+    {
+        if (!$this->_isParsed)
+        {
+            $this->_parseData();
+            $this->_isParsed = true;
+        }
+
+        return isset($this->_parsedData->$key);
+    }
+
+    /**
+     * Parse the raw response into the parsed_data array for access
+     *
+     * @throws Apache_Solr_ParserException If the data could not be parsed
+     */
+    protected function _parseData()
+    {
+        //An alternative would be to use Zend_Json::decode(...)
+        $data = json_decode($this->_response->getBody());
+
+        // check that we receive a valid JSON response - we should never receive a null
+        if ($data === null)
+        {
+            throw new Apache_Solr_ParserException('Solr response does not appear to be valid JSON, please examine the raw response with getRawResponse() method');
+        }
+
+        //if we're configured to collapse single valued arrays or to convert them to Apache_Solr_Document objects
+        //and we have response documents, then try to collapse the values and / or convert them now
+        if (($this->_createDocuments || $this->_collapseSingleValueArrays) && isset($data->response) && is_array($data->response->docs))
+        {
+            $documents = array();
+
+            foreach ($data->response->docs as $originalDocument)
+            {
+                if ($this->_createDocuments)
+                {
+                    $document = new Apache_Solr_Document();
+                }
+                else
+                {
+                    $document = $originalDocument;
+                }
+
+                foreach ($originalDocument as $key => $value)
+                {
+                    //If a result is an array with only a single
+                    //value then its nice to be able to access
+                    //it as if it were always a single value
+                    if ($this->_collapseSingleValueArrays && is_array($value) && count($value) <= 1)
+                    {
+                        $value = array_shift($value);
+                    }
+
+                    $document->$key = $value;
+                }
+
+                $documents[] = $document;
+            }
+
+            $data->response->docs = $documents;
+        }
+
+        $this->_parsedData = $data;
+    }
 }
\ No newline at end of file

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

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_ParserException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: ParserException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: ParserException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file

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

Indentation +1083 added lines, -1083 removed lines

@@ -85,1097 +85,1097 @@
  */
 class Apache_Solr_Service
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 59 $';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Service.php 59 2011-02-08 20:38:59Z donovan.jimenez $';
-
-	/**
-	 * Response writer we'll request - JSON. See http://code.google.com/p/solr-php-client/issues/detail?id=6#c1 for reasoning
-	 */
-	const SOLR_WRITER = 'json';
-
-	/**
-	 * NamedList Treatment constants
-	 */
-	const NAMED_LIST_FLAT = 'flat';
-	const NAMED_LIST_MAP = 'map';
-
-	/**
-	 * Search HTTP Methods
-	 */
-	const METHOD_GET = 'GET';
-	const METHOD_POST = 'POST';
-
-	/**
-	 * Servlet mappings
-	 */
-	const PING_SERVLET = 'admin/ping';
-	const UPDATE_SERVLET = 'update';
-	const SEARCH_SERVLET = 'select';
-	const THREADS_SERVLET = 'admin/threads';
-	const EXTRACT_SERVLET = 'update/extract';
-
-	/**
-	 * Server identification strings
-	 *
-	 * @var string
-	 */
-	protected $_host, $_port, $_path;
-
-	/**
-	 * Whether {@link Apache_Solr_Response} objects should create {@link Apache_Solr_Document}s in
-	 * the returned parsed data
-	 *
-	 * @var boolean
-	 */
-	protected $_createDocuments = true;
-
-	/**
-	 * Whether {@link Apache_Solr_Response} objects should have multivalue fields with only a single value
-	 * collapsed to appear as a single value would.
-	 *
-	 * @var boolean
-	 */
-	protected $_collapseSingleValueArrays = true;
-
-	/**
-	 * How NamedLists should be formatted in the output.  This specifically effects facet counts. Valid values
-	 * are {@link Apache_Solr_Service::NAMED_LIST_MAP} (default) or {@link Apache_Solr_Service::NAMED_LIST_FLAT}.
-	 *
-	 * @var string
-	 */
-	protected $_namedListTreatment = self::NAMED_LIST_MAP;
-
-	/**
-	 * Query delimiters. Someone might want to be able to change
-	 * these (to use & instead of & for example), so I've provided them.
-	 *
-	 * @var string
-	 */
-	protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = true;
-
-	/**
-	 * Constructed servlet full path URLs
-	 *
-	 * @var string
-	 */
-	protected $_pingUrl, $_updateUrl, $_searchUrl, $_threadsUrl;
-
-	/**
-	 * Keep track of whether our URLs have been constructed
-	 *
-	 * @var boolean
-	 */
-	protected $_urlsInited = false;
-
-	/**
-	 * HTTP Transport implementation (pluggable)
-	 *
-	 * @var Apache_Solr_HttpTransport_Interface
-	 */
-	protected $_httpTransport = false;
-
-	/**
-	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
-	 *
-	 * NOTE: inside a phrase fewer characters need escaped, use {@link Apache_Solr_Service::escapePhrase()} instead
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function escape($value)
-	{
-		//list taken from http://lucene.apache.org/java/docs/queryparsersyntax.html#Escaping%20Special%20Characters
-		$pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
-		$replace = '\\\$1';
-
-		return preg_replace($pattern, $replace, $value);
-	}
-
-	/**
-	 * Escape a value meant to be contained in a phrase for special query characters
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function escapePhrase($value)
-	{
-		$pattern = '/("|\\\)/';
-		$replace = '\\\$1';
-
-		return preg_replace($pattern, $replace, $value);
-	}
-
-	/**
-	 * Convenience function for creating phrase syntax from a value
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	static public function phrase($value)
-	{
-		return '"' . self::escapePhrase($value) . '"';
-	}
-
-	/**
-	 * Constructor. All parameters are optional and will take on default values
-	 * if not specified.
-	 *
-	 * @param string $host
-	 * @param string $port
-	 * @param string $path
-	 * @param Apache_Solr_HttpTransport_Interface $httpTransport
-	 */
-	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false)
-	{
-		$this->setHost($host);
-		$this->setPort($port);
-		$this->setPath($path);
-
-		$this->_initUrls();
-
-		if ($httpTransport)
-		{
-			$this->setHttpTransport($httpTransport);
-		}
-
-		// check that our php version is >= 5.1.3 so we can correct for http_build_query behavior later
-		$this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>=');
-	}
-
-	/**
-	 * Return a valid http URL given this server's host, port and path and a provided servlet name
-	 *
-	 * @param string $servlet
-	 * @return string
-	 */
-	protected function _constructUrl($servlet, $params = array())
-	{
-		if (count($params))
-		{
-			//escape all parameters appropriately for inclusion in the query string
-			$escapedParams = array();
-
-			foreach ($params as $key => $value)
-			{
-				$escapedParams[] = urlencode($key) . '=' . urlencode($value);
-			}
-
-			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
-		}
-		else
-		{
-			$queryString = '';
-		}
-
-		return 'http://' . $this->_host . ':' . $this->_port . $this->_path . $servlet . $queryString;
-	}
-
-	/**
-	 * Construct the Full URLs for the three servlets we reference
-	 */
-	protected function _initUrls()
-	{
-		//Initialize our full servlet URLs now that we have server information
-		$this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET);
-		$this->_pingUrl = $this->_constructUrl(self::PING_SERVLET);
-		$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->_urlsInited = true;
-	}
-
-	protected function _generateQueryString($params)
-	{
-		// use http_build_query to encode our arguments because its faster
-		// than urlencoding all the parts ourselves in a loop
-		//
-		// because http_build_query treats arrays differently than we want to, correct the query
-		// string by changing foo[#]=bar (# being an actual number) parameter strings to just
-		// multiple foo=bar strings. This regex should always work since '=' will be urlencoded
-		// anywhere else the regex isn't expecting it
-		//
-		// NOTE: before php 5.1.3 brackets were not url encoded by http_build query - we've checked
-		// the php version in the constructor and put the results in the instance variable. Also, before
-		// 5.1.2 the arg_separator parameter was not available, so don't use it
-		if ($this->_queryBracketsEscaped)
-		{
-			$queryString = http_build_query($params, null, $this->_queryStringDelimiter);
-			return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
-		}
-		else
-		{
-			$queryString = http_build_query($params);
-			return preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $queryString);
-		}
-	}
-
-	/**
-	 * Central method for making a get operation against this Solr Server
-	 *
-	 * @param string $url
-	 * @param float $timeout Read timeout in seconds
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
-	 */
-	protected function _sendRawGet($url, $timeout = FALSE)
-	{
-		$httpTransport = $this->getHttpTransport();
-
-		$httpResponse = $httpTransport->performGetRequest($url, $timeout);
-		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
-
-		if ($solrResponse->getHttpStatus() != 200)
-		{
-			throw new Apache_Solr_HttpTransportException($solrResponse);
-		}
-
-		return $solrResponse;
-	}
-
-	/**
-	 * Central method for making a post operation against this Solr Server
-	 *
-	 * @param string $url
-	 * @param string $rawPost
-	 * @param float $timeout Read timeout in seconds
-	 * @param string $contentType
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
-	 */
-	protected function _sendRawPost($url, $rawPost, $timeout = FALSE, $contentType = 'text/xml; charset=UTF-8')
-	{
-		$httpTransport = $this->getHttpTransport();
-
-		$httpResponse = $httpTransport->performPostRequest($url, $rawPost, $contentType, $timeout);
-		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
-
-		if ($solrResponse->getHttpStatus() != 200)
-		{
-			throw new Apache_Solr_HttpTransportException($solrResponse);
-		}
-
-		return $solrResponse;
-	}
-
-	/**
-	 * Returns the set host
-	 *
-	 * @return string
-	 */
-	public function getHost()
-	{
-		return $this->_host;
-	}
-
-	/**
-	 * Set the host used. If empty will fallback to constants
-	 *
-	 * @param string $host
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If the host parameter is empty
-	 */
-	public function setHost($host)
-	{
-		//Use the provided host or use the default
-		if (empty($host))
-		{
-			throw new Apache_Solr_InvalidArgumentException('Host parameter is empty');
-		}
-		else
-		{
-			$this->_host = $host;
-		}
-
-		if ($this->_urlsInited)
-		{
-			$this->_initUrls();
-		}
-	}
-
-	/**
-	 * Get the set port
-	 *
-	 * @return integer
-	 */
-	public function getPort()
-	{
-		return $this->_port;
-	}
-
-	/**
-	 * Set the port used. If empty will fallback to constants
-	 *
-	 * @param integer $port
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException If the port parameter is empty
-	 */
-	public function setPort($port)
-	{
-		//Use the provided port or use the default
-		$port = (int) $port;
-
-		if ($port <= 0)
-		{
-			throw new Apache_Solr_InvalidArgumentException('Port is not a valid port number');
-		}
-		else
-		{
-			$this->_port = $port;
-		}
-
-		if ($this->_urlsInited)
-		{
-			$this->_initUrls();
-		}
-	}
-
-	/**
-	 * Get the set path.
-	 *
-	 * @return string
-	 */
-	public function getPath()
-	{
-		return $this->_path;
-	}
-
-	/**
-	 * Set the path used. If empty will fallback to constants
-	 *
-	 * @param string $path
-	 */
-	public function setPath($path)
-	{
-		$path = trim($path, '/');
-
-		$this->_path = '/' . $path . '/';
-
-		if ($this->_urlsInited)
-		{
-			$this->_initUrls();
-		}
-	}
-
-	/**
-	 * Get the current configured HTTP Transport
-	 *
-	 * @return HttpTransportInterface
-	 */
-	public function getHttpTransport()
-	{
-		// lazy load a default if one has not be set
-		if ($this->_httpTransport === false)
-		{
-			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
-
-			$this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents();
-		}
-
-		return $this->_httpTransport;
-	}
-
-	/**
-	 * Set the HTTP Transport implemenation that will be used for all HTTP requests
-	 *
-	 * @param Apache_Solr_HttpTransport_Interface
-	 */
-	public function setHttpTransport(Apache_Solr_HttpTransport_Interface $httpTransport)
-	{
-		$this->_httpTransport = $httpTransport;
-	}
-
-	/**
-	 * Set the create documents flag. This determines whether {@link Apache_Solr_Response} objects will
-	 * parse the response and create {@link Apache_Solr_Document} instances in place.
-	 *
-	 * @param boolean $createDocuments
-	 */
-	public function setCreateDocuments($createDocuments)
-	{
-		$this->_createDocuments = (bool) $createDocuments;
-	}
-
-	/**
-	 * Get the current state of the create documents flag.
-	 *
-	 * @return boolean
-	 */
-	public function getCreateDocuments()
-	{
-		return $this->_createDocuments;
-	}
-
-	/**
-	 * Set the collapse single value arrays flag.
-	 *
-	 * @param boolean $collapseSingleValueArrays
-	 */
-	public function setCollapseSingleValueArrays($collapseSingleValueArrays)
-	{
-		$this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
-	}
-
-	/**
-	 * Get the current state of the collapse single value arrays flag.
-	 *
-	 * @return boolean
-	 */
-	public function getCollapseSingleValueArrays()
-	{
-		return $this->_collapseSingleValueArrays;
-	}
-
-	/**
-	 * Get the current default timeout setting (initially the default_socket_timeout ini setting)
-	 * in seconds
-	 *
-	 * @return float
-	 *
-	 * @deprecated Use the getDefaultTimeout method on the HTTP transport implementation
-	 */
-	public function getDefaultTimeout()
-	{
-		return $this->getHttpTransport()->getDefaultTimeout();
-	}
-
-	/**
-	 * Set the default timeout for all calls that aren't passed a specific timeout
-	 *
-	 * @param float $timeout Timeout value in seconds
-	 *
-	 * @deprecated Use the setDefaultTimeout method on the HTTP transport implementation
-	 */
-	public function setDefaultTimeout($timeout)
-	{
-		$this->getHttpTransport()->setDefaultTimeout($timeout);
-	}
-
-	/**
-	 * Set how NamedLists should be formatted in the response data. This mainly effects
-	 * the facet counts format.
-	 *
-	 * @param string $namedListTreatment
-	 * @throws Apache_Solr_InvalidArgumentException If invalid option is set
-	 */
-	public function setNamedListTreatment($namedListTreatment)
-	{
-		switch ((string) $namedListTreatment)
-		{
-			case Apache_Solr_Service::NAMED_LIST_FLAT:
-				$this->_namedListTreatment = Apache_Solr_Service::NAMED_LIST_FLAT;
-				break;
-
-			case Apache_Solr_Service::NAMED_LIST_MAP:
-				$this->_namedListTreatment = Apache_Solr_Service::NAMED_LIST_MAP;
-				break;
-
-			default:
-				throw new Apache_Solr_InvalidArgumentException('Not a valid named list treatement option');
-		}
-	}
-
-	/**
-	 * Get the current setting for named list treatment.
-	 *
-	 * @return string
-	 */
-	public function getNamedListTreatment()
-	{
-		return $this->_namedListTreatment;
-	}
-
-	/**
-	 * Set the string used to separate the path form the query string.
-	 * Defaulted to '?'
-	 *
-	 * @param string $queryDelimiter
-	 */
-	public function setQueryDelimiter($queryDelimiter)
-	{
-		$this->_queryDelimiter = $queryDelimiter;
-	}
-
-	/**
-	 * Set the string used to separate the parameters in thequery string
-	 * Defaulted to '&'
-	 *
-	 * @param string $queryStringDelimiter
-	 */
-	public function setQueryStringDelimiter($queryStringDelimiter)
-	{
-		$this->_queryStringDelimiter = $queryStringDelimiter;
-	}
-
-	/**
-	 * Call the /admin/ping servlet, can be used to quickly tell if a connection to the
-	 * server is able to be made.
-	 *
-	 * @param float $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
-	 * @return float Actual time taken to ping the server, FALSE if timeout or HTTP error status occurs
-	 */
-	public function ping($timeout = 2)
-	{
-		$start = microtime(true);
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 59 $';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Service.php 59 2011-02-08 20:38:59Z donovan.jimenez $';
+
+    /**
+     * Response writer we'll request - JSON. See http://code.google.com/p/solr-php-client/issues/detail?id=6#c1 for reasoning
+     */
+    const SOLR_WRITER = 'json';
+
+    /**
+     * NamedList Treatment constants
+     */
+    const NAMED_LIST_FLAT = 'flat';
+    const NAMED_LIST_MAP = 'map';
+
+    /**
+     * Search HTTP Methods
+     */
+    const METHOD_GET = 'GET';
+    const METHOD_POST = 'POST';
+
+    /**
+     * Servlet mappings
+     */
+    const PING_SERVLET = 'admin/ping';
+    const UPDATE_SERVLET = 'update';
+    const SEARCH_SERVLET = 'select';
+    const THREADS_SERVLET = 'admin/threads';
+    const EXTRACT_SERVLET = 'update/extract';
+
+    /**
+     * Server identification strings
+     *
+     * @var string
+     */
+    protected $_host, $_port, $_path;
+
+    /**
+     * Whether {@link Apache_Solr_Response} objects should create {@link Apache_Solr_Document}s in
+     * the returned parsed data
+     *
+     * @var boolean
+     */
+    protected $_createDocuments = true;
+
+    /**
+     * Whether {@link Apache_Solr_Response} objects should have multivalue fields with only a single value
+     * collapsed to appear as a single value would.
+     *
+     * @var boolean
+     */
+    protected $_collapseSingleValueArrays = true;
+
+    /**
+     * How NamedLists should be formatted in the output.  This specifically effects facet counts. Valid values
+     * are {@link Apache_Solr_Service::NAMED_LIST_MAP} (default) or {@link Apache_Solr_Service::NAMED_LIST_FLAT}.
+     *
+     * @var string
+     */
+    protected $_namedListTreatment = self::NAMED_LIST_MAP;
+
+    /**
+     * Query delimiters. Someone might want to be able to change
+     * these (to use &amp; instead of & for example), so I've provided them.
+     *
+     * @var string
+     */
+    protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = true;
+
+    /**
+     * Constructed servlet full path URLs
+     *
+     * @var string
+     */
+    protected $_pingUrl, $_updateUrl, $_searchUrl, $_threadsUrl;
+
+    /**
+     * Keep track of whether our URLs have been constructed
+     *
+     * @var boolean
+     */
+    protected $_urlsInited = false;
+
+    /**
+     * HTTP Transport implementation (pluggable)
+     *
+     * @var Apache_Solr_HttpTransport_Interface
+     */
+    protected $_httpTransport = false;
+
+    /**
+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
+     *
+     * NOTE: inside a phrase fewer characters need escaped, use {@link Apache_Solr_Service::escapePhrase()} instead
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function escape($value)
+    {
+        //list taken from http://lucene.apache.org/java/docs/queryparsersyntax.html#Escaping%20Special%20Characters
+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
+        $replace = '\\\$1';
+
+        return preg_replace($pattern, $replace, $value);
+    }
+
+    /**
+     * Escape a value meant to be contained in a phrase for special query characters
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function escapePhrase($value)
+    {
+        $pattern = '/("|\\\)/';
+        $replace = '\\\$1';
+
+        return preg_replace($pattern, $replace, $value);
+    }
+
+    /**
+     * Convenience function for creating phrase syntax from a value
+     *
+     * @param string $value
+     * @return string
+     */
+    static public function phrase($value)
+    {
+        return '"' . self::escapePhrase($value) . '"';
+    }
+
+    /**
+     * Constructor. All parameters are optional and will take on default values
+     * if not specified.
+     *
+     * @param string $host
+     * @param string $port
+     * @param string $path
+     * @param Apache_Solr_HttpTransport_Interface $httpTransport
+     */
+    public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false)
+    {
+        $this->setHost($host);
+        $this->setPort($port);
+        $this->setPath($path);
+
+        $this->_initUrls();
+
+        if ($httpTransport)
+        {
+            $this->setHttpTransport($httpTransport);
+        }
+
+        // check that our php version is >= 5.1.3 so we can correct for http_build_query behavior later
+        $this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>=');
+    }
+
+    /**
+     * Return a valid http URL given this server's host, port and path and a provided servlet name
+     *
+     * @param string $servlet
+     * @return string
+     */
+    protected function _constructUrl($servlet, $params = array())
+    {
+        if (count($params))
+        {
+            //escape all parameters appropriately for inclusion in the query string
+            $escapedParams = array();
+
+            foreach ($params as $key => $value)
+            {
+                $escapedParams[] = urlencode($key) . '=' . urlencode($value);
+            }
+
+            $queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
+        }
+        else
+        {
+            $queryString = '';
+        }
+
+        return 'http://' . $this->_host . ':' . $this->_port . $this->_path . $servlet . $queryString;
+    }
+
+    /**
+     * Construct the Full URLs for the three servlets we reference
+     */
+    protected function _initUrls()
+    {
+        //Initialize our full servlet URLs now that we have server information
+        $this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET);
+        $this->_pingUrl = $this->_constructUrl(self::PING_SERVLET);
+        $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->_urlsInited = true;
+    }
+
+    protected function _generateQueryString($params)
+    {
+        // use http_build_query to encode our arguments because its faster
+        // than urlencoding all the parts ourselves in a loop
+        //
+        // because http_build_query treats arrays differently than we want to, correct the query
+        // string by changing foo[#]=bar (# being an actual number) parameter strings to just
+        // multiple foo=bar strings. This regex should always work since '=' will be urlencoded
+        // anywhere else the regex isn't expecting it
+        //
+        // NOTE: before php 5.1.3 brackets were not url encoded by http_build query - we've checked
+        // the php version in the constructor and put the results in the instance variable. Also, before
+        // 5.1.2 the arg_separator parameter was not available, so don't use it
+        if ($this->_queryBracketsEscaped)
+        {
+            $queryString = http_build_query($params, null, $this->_queryStringDelimiter);
+            return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
+        }
+        else
+        {
+            $queryString = http_build_query($params);
+            return preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $queryString);
+        }
+    }
+
+    /**
+     * Central method for making a get operation against this Solr Server
+     *
+     * @param string $url
+     * @param float $timeout Read timeout in seconds
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
+     */
+    protected function _sendRawGet($url, $timeout = FALSE)
+    {
+        $httpTransport = $this->getHttpTransport();
+
+        $httpResponse = $httpTransport->performGetRequest($url, $timeout);
+        $solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
+
+        if ($solrResponse->getHttpStatus() != 200)
+        {
+            throw new Apache_Solr_HttpTransportException($solrResponse);
+        }
+
+        return $solrResponse;
+    }
+
+    /**
+     * Central method for making a post operation against this Solr Server
+     *
+     * @param string $url
+     * @param string $rawPost
+     * @param float $timeout Read timeout in seconds
+     * @param string $contentType
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If a non 200 response status is returned
+     */
+    protected function _sendRawPost($url, $rawPost, $timeout = FALSE, $contentType = 'text/xml; charset=UTF-8')
+    {
+        $httpTransport = $this->getHttpTransport();
+
+        $httpResponse = $httpTransport->performPostRequest($url, $rawPost, $contentType, $timeout);
+        $solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
+
+        if ($solrResponse->getHttpStatus() != 200)
+        {
+            throw new Apache_Solr_HttpTransportException($solrResponse);
+        }
+
+        return $solrResponse;
+    }
+
+    /**
+     * Returns the set host
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->_host;
+    }
+
+    /**
+     * Set the host used. If empty will fallback to constants
+     *
+     * @param string $host
+     *
+     * @throws Apache_Solr_InvalidArgumentException If the host parameter is empty
+     */
+    public function setHost($host)
+    {
+        //Use the provided host or use the default
+        if (empty($host))
+        {
+            throw new Apache_Solr_InvalidArgumentException('Host parameter is empty');
+        }
+        else
+        {
+            $this->_host = $host;
+        }
+
+        if ($this->_urlsInited)
+        {
+            $this->_initUrls();
+        }
+    }
+
+    /**
+     * Get the set port
+     *
+     * @return integer
+     */
+    public function getPort()
+    {
+        return $this->_port;
+    }
+
+    /**
+     * Set the port used. If empty will fallback to constants
+     *
+     * @param integer $port
+     *
+     * @throws Apache_Solr_InvalidArgumentException If the port parameter is empty
+     */
+    public function setPort($port)
+    {
+        //Use the provided port or use the default
+        $port = (int) $port;
+
+        if ($port <= 0)
+        {
+            throw new Apache_Solr_InvalidArgumentException('Port is not a valid port number');
+        }
+        else
+        {
+            $this->_port = $port;
+        }
+
+        if ($this->_urlsInited)
+        {
+            $this->_initUrls();
+        }
+    }
+
+    /**
+     * Get the set path.
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->_path;
+    }
+
+    /**
+     * Set the path used. If empty will fallback to constants
+     *
+     * @param string $path
+     */
+    public function setPath($path)
+    {
+        $path = trim($path, '/');
+
+        $this->_path = '/' . $path . '/';
+
+        if ($this->_urlsInited)
+        {
+            $this->_initUrls();
+        }
+    }
+
+    /**
+     * Get the current configured HTTP Transport
+     *
+     * @return HttpTransportInterface
+     */
+    public function getHttpTransport()
+    {
+        // lazy load a default if one has not be set
+        if ($this->_httpTransport === false)
+        {
+            require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
+
+            $this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents();
+        }
+
+        return $this->_httpTransport;
+    }
+
+    /**
+     * Set the HTTP Transport implemenation that will be used for all HTTP requests
+     *
+     * @param Apache_Solr_HttpTransport_Interface
+     */
+    public function setHttpTransport(Apache_Solr_HttpTransport_Interface $httpTransport)
+    {
+        $this->_httpTransport = $httpTransport;
+    }
+
+    /**
+     * Set the create documents flag. This determines whether {@link Apache_Solr_Response} objects will
+     * parse the response and create {@link Apache_Solr_Document} instances in place.
+     *
+     * @param boolean $createDocuments
+     */
+    public function setCreateDocuments($createDocuments)
+    {
+        $this->_createDocuments = (bool) $createDocuments;
+    }
+
+    /**
+     * Get the current state of the create documents flag.
+     *
+     * @return boolean
+     */
+    public function getCreateDocuments()
+    {
+        return $this->_createDocuments;
+    }
+
+    /**
+     * Set the collapse single value arrays flag.
+     *
+     * @param boolean $collapseSingleValueArrays
+     */
+    public function setCollapseSingleValueArrays($collapseSingleValueArrays)
+    {
+        $this->_collapseSingleValueArrays = (bool) $collapseSingleValueArrays;
+    }
+
+    /**
+     * Get the current state of the collapse single value arrays flag.
+     *
+     * @return boolean
+     */
+    public function getCollapseSingleValueArrays()
+    {
+        return $this->_collapseSingleValueArrays;
+    }
+
+    /**
+     * Get the current default timeout setting (initially the default_socket_timeout ini setting)
+     * in seconds
+     *
+     * @return float
+     *
+     * @deprecated Use the getDefaultTimeout method on the HTTP transport implementation
+     */
+    public function getDefaultTimeout()
+    {
+        return $this->getHttpTransport()->getDefaultTimeout();
+    }
+
+    /**
+     * Set the default timeout for all calls that aren't passed a specific timeout
+     *
+     * @param float $timeout Timeout value in seconds
+     *
+     * @deprecated Use the setDefaultTimeout method on the HTTP transport implementation
+     */
+    public function setDefaultTimeout($timeout)
+    {
+        $this->getHttpTransport()->setDefaultTimeout($timeout);
+    }
+
+    /**
+     * Set how NamedLists should be formatted in the response data. This mainly effects
+     * the facet counts format.
+     *
+     * @param string $namedListTreatment
+     * @throws Apache_Solr_InvalidArgumentException If invalid option is set
+     */
+    public function setNamedListTreatment($namedListTreatment)
+    {
+        switch ((string) $namedListTreatment)
+        {
+            case Apache_Solr_Service::NAMED_LIST_FLAT:
+                $this->_namedListTreatment = Apache_Solr_Service::NAMED_LIST_FLAT;
+                break;
+
+            case Apache_Solr_Service::NAMED_LIST_MAP:
+                $this->_namedListTreatment = Apache_Solr_Service::NAMED_LIST_MAP;
+                break;
+
+            default:
+                throw new Apache_Solr_InvalidArgumentException('Not a valid named list treatement option');
+        }
+    }
+
+    /**
+     * Get the current setting for named list treatment.
+     *
+     * @return string
+     */
+    public function getNamedListTreatment()
+    {
+        return $this->_namedListTreatment;
+    }
+
+    /**
+     * Set the string used to separate the path form the query string.
+     * Defaulted to '?'
+     *
+     * @param string $queryDelimiter
+     */
+    public function setQueryDelimiter($queryDelimiter)
+    {
+        $this->_queryDelimiter = $queryDelimiter;
+    }
+
+    /**
+     * Set the string used to separate the parameters in thequery string
+     * Defaulted to '&'
+     *
+     * @param string $queryStringDelimiter
+     */
+    public function setQueryStringDelimiter($queryStringDelimiter)
+    {
+        $this->_queryStringDelimiter = $queryStringDelimiter;
+    }
+
+    /**
+     * Call the /admin/ping servlet, can be used to quickly tell if a connection to the
+     * server is able to be made.
+     *
+     * @param float $timeout maximum time to wait for ping in seconds, -1 for unlimited (default is 2)
+     * @return float Actual time taken to ping the server, FALSE if timeout or HTTP error status occurs
+     */
+    public function ping($timeout = 2)
+    {
+        $start = microtime(true);
 		
-		$httpTransport = $this->getHttpTransport();
-
-		$httpResponse = $httpTransport->performHeadRequest($this->_pingUrl, $timeout);
-		$solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
-
-		if ($solrResponse->getHttpStatus() == 200)
-		{
-			return microtime(true) - $start;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Call the /admin/threads servlet and retrieve information about all threads in the
-	 * Solr servlet's thread group. Useful for diagnostics.
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function threads()
-	{
-		return $this->_sendRawGet($this->_threadsUrl);
-	}
-
-	/**
-	 * Raw Add Method. Takes a raw post body and sends it to the update service.  Post body
-	 * should be a complete and well formed "add" xml document.
-	 *
-	 * @param string $rawPost
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function add($rawPost)
-	{
-		return $this->_sendRawPost($this->_updateUrl, $rawPost);
-	}
-
-	/**
-	 * Add a Solr Document to the index
-	 *
-	 * @param Apache_Solr_Document $document
-	 * @param boolean $allowDups
-	 * @param boolean $overwritePending
-	 * @param boolean $overwriteCommitted
-	 * @param integer $commitWithin The number of milliseconds that a document must be committed within, see @{link http://wiki.apache.org/solr/UpdateXmlMessages#The_Update_Schema} for details.  If left empty this property will not be set in the request.
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
-	{
-		$dupValue = $allowDups ? 'true' : 'false';
-		$pendingValue = $overwritePending ? 'true' : 'false';
-		$committedValue = $overwriteCommitted ? 'true' : 'false';
+        $httpTransport = $this->getHttpTransport();
+
+        $httpResponse = $httpTransport->performHeadRequest($this->_pingUrl, $timeout);
+        $solrResponse = new Apache_Solr_Response($httpResponse, $this->_createDocuments, $this->_collapseSingleValueArrays);
+
+        if ($solrResponse->getHttpStatus() == 200)
+        {
+            return microtime(true) - $start;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    /**
+     * Call the /admin/threads servlet and retrieve information about all threads in the
+     * Solr servlet's thread group. Useful for diagnostics.
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function threads()
+    {
+        return $this->_sendRawGet($this->_threadsUrl);
+    }
+
+    /**
+     * Raw Add Method. Takes a raw post body and sends it to the update service.  Post body
+     * should be a complete and well formed "add" xml document.
+     *
+     * @param string $rawPost
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function add($rawPost)
+    {
+        return $this->_sendRawPost($this->_updateUrl, $rawPost);
+    }
+
+    /**
+     * Add a Solr Document to the index
+     *
+     * @param Apache_Solr_Document $document
+     * @param boolean $allowDups
+     * @param boolean $overwritePending
+     * @param boolean $overwriteCommitted
+     * @param integer $commitWithin The number of milliseconds that a document must be committed within, see @{link http://wiki.apache.org/solr/UpdateXmlMessages#The_Update_Schema} for details.  If left empty this property will not be set in the request.
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+    {
+        $dupValue = $allowDups ? 'true' : 'false';
+        $pendingValue = $overwritePending ? 'true' : 'false';
+        $committedValue = $overwriteCommitted ? 'true' : 'false';
 		
-		$commitWithin = (int) $commitWithin;
-		$commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
+        $commitWithin = (int) $commitWithin;
+        $commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
 		
-		$rawPost = "<add allowDups=\"{$dupValue}\" overwritePending=\"{$pendingValue}\" overwriteCommitted=\"{$committedValue}\"{$commitWithinString}>";
-		$rawPost .= $this->_documentToXmlFragment($document);
-		$rawPost .= '</add>';
-
-		return $this->add($rawPost);
-	}
-
-	/**
-	 * Add an array of Solr Documents to the index all at once
-	 *
-	 * @param array $documents Should be an array of Apache_Solr_Document instances
-	 * @param boolean $allowDups
-	 * @param boolean $overwritePending
-	 * @param boolean $overwriteCommitted
-	 * @param integer $commitWithin The number of milliseconds that a document must be committed within, see @{link http://wiki.apache.org/solr/UpdateXmlMessages#The_Update_Schema} for details.  If left empty this property will not be set in the request.
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
-	{
-		$dupValue = $allowDups ? 'true' : 'false';
-		$pendingValue = $overwritePending ? 'true' : 'false';
-		$committedValue = $overwriteCommitted ? 'true' : 'false';
-
-		$commitWithin = (int) $commitWithin;
-		$commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
-
-		$rawPost = "<add allowDups=\"{$dupValue}\" overwritePending=\"{$pendingValue}\" overwriteCommitted=\"{$committedValue}\"{$commitWithinString}>";
-
-		foreach ($documents as $document)
-		{
-			if ($document instanceof Apache_Solr_Document)
-			{
-				$rawPost .= $this->_documentToXmlFragment($document);
-			}
-		}
-
-		$rawPost .= '</add>';
-
-		return $this->add($rawPost);
-	}
-
-	/**
-	 * Create an XML fragment from a {@link Apache_Solr_Document} instance appropriate for use inside a Solr add call
-	 *
-	 * @return string
-	 */
-	protected function _documentToXmlFragment(Apache_Solr_Document $document)
-	{
-		$xml = '<doc';
-
-		if ($document->getBoost() !== false)
-		{
-			$xml .= ' boost="' . $document->getBoost() . '"';
-		}
-
-		$xml .= '>';
-
-		foreach ($document as $key => $value)
-		{
-			$key = htmlspecialchars($key, ENT_QUOTES, 'UTF-8');
-			$fieldBoost = $document->getFieldBoost($key);
-
-			if (is_array($value))
-			{
-				foreach ($value as $multivalue)
-				{
-					$xml .= '<field name="' . $key . '"';
-
-					if ($fieldBoost !== false)
-					{
-						$xml .= ' boost="' . $fieldBoost . '"';
-
-						// only set the boost for the first field in the set
-						$fieldBoost = false;
-					}
-
-					$multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
-
-					$xml .= '>' . $multivalue . '</field>';
-				}
-			}
-			else
-			{
-				$xml .= '<field name="' . $key . '"';
-
-				if ($fieldBoost !== false)
-				{
-					$xml .= ' boost="' . $fieldBoost . '"';
-				}
-
-				$value = htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
-
-				$xml .= '>' . $value . '</field>';
-			}
-		}
-
-		$xml .= '</doc>';
-
-		// replace any control characters to avoid Solr XML parser exception
-		return $this->_stripCtrlChars($xml);
-	}
-
-	/**
-	 * Replace control (non-printable) characters from string that are invalid to Solr's XML parser with a space.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	protected function _stripCtrlChars($string)
-	{
-		// See:  http://w3.org/International/questions/qa-forms-utf-8.html
-		// Printable utf-8 does not include any of these chars below x7F
-		return preg_replace('@[\x00-\x08\x0B\x0C\x0E-\x1F]@', ' ', $string);
-	}
-
-	/**
-	 * Send a commit command.  Will be synchronous unless both wait parameters are set to false.
-	 *
-	 * @param boolean $expungeDeletes Defaults to false, merge segments with deletes away
-	 * @param boolean $waitFlush Defaults to true,  block until index changes are flushed to disk
-	 * @param boolean $waitSearcher Defaults to true, block until a new searcher is opened and registered as the main query searcher, making the changes visible
-	 * @param float $timeout Maximum expected duration (in seconds) of the commit operation on the server (otherwise, will throw a communication exception). Defaults to 1 hour
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
-		$expungeValue = $expungeDeletes ? 'true' : 'false';
-		$flushValue = $waitFlush ? 'true' : 'false';
-		$searcherValue = $waitSearcher ? 'true' : 'false';
-
-		$rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
-
-		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
-	}
-
-	/**
-	 * Raw Delete Method. Takes a raw post body and sends it to the update service. Body should be
-	 * a complete and well formed "delete" xml document
-	 *
-	 * @param string $rawPost Expected to be utf-8 encoded xml document
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function delete($rawPost, $timeout = 3600)
-	{
-		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
-	}
-
-	/**
-	 * Create a delete document based on document ID
-	 *
-	 * @param string $id Expected to be utf-8 encoded
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$pendingValue = $fromPending ? 'true' : 'false';
-		$committedValue = $fromCommitted ? 'true' : 'false';
-
-		//escape special xml characters
-		$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
-
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><id>' . $id . '</id></delete>';
-
-		return $this->delete($rawPost, $timeout);
-	}
-
-	/**
-	 * Create and post a delete document based on multiple document IDs.
-	 *
-	 * @param array $ids Expected to be utf-8 encoded strings
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$pendingValue = $fromPending ? 'true' : 'false';
-		$committedValue = $fromCommitted ? 'true' : 'false';
-
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">';
-
-		foreach ($ids as $id)
-		{
-			//escape special xml characters
-			$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
-
-			$rawPost .= '<id>' . $id . '</id>';
-		}
-
-		$rawPost .= '</delete>';
-
-		return $this->delete($rawPost, $timeout);
-	}
-
-	/**
-	 * Create a delete document based on a query and submit it
-	 *
-	 * @param string $rawQuery Expected to be utf-8 encoded
-	 * @param boolean $fromPending
-	 * @param boolean $fromCommitted
-	 * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
-	{
-		$pendingValue = $fromPending ? 'true' : 'false';
-		$committedValue = $fromCommitted ? 'true' : 'false';
-
-		// escape special xml characters
-		$rawQuery = htmlspecialchars($rawQuery, ENT_NOQUOTES, 'UTF-8');
-
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><query>' . $rawQuery . '</query></delete>';
-
-		return $this->delete($rawPost, $timeout);
-	}
-
-	/**
-	 * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
-	 * to use Solr Cell and what parameters are available.
-	 *
-	 * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
-	 * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
-	 * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
-	 * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
-	 *
-	 * @param string $file Path to file to extract data from
-	 * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
-	 * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
-	 * @param string $mimetype optional mimetype specification (for the file being extracted)
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
-	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
-		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
-				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
-			}
-		}
-		else
-		{
-			$params = array();
-		}
+        $rawPost = "<add allowDups=\"{$dupValue}\" overwritePending=\"{$pendingValue}\" overwriteCommitted=\"{$committedValue}\"{$commitWithinString}>";
+        $rawPost .= $this->_documentToXmlFragment($document);
+        $rawPost .= '</add>';
+
+        return $this->add($rawPost);
+    }
+
+    /**
+     * Add an array of Solr Documents to the index all at once
+     *
+     * @param array $documents Should be an array of Apache_Solr_Document instances
+     * @param boolean $allowDups
+     * @param boolean $overwritePending
+     * @param boolean $overwriteCommitted
+     * @param integer $commitWithin The number of milliseconds that a document must be committed within, see @{link http://wiki.apache.org/solr/UpdateXmlMessages#The_Update_Schema} for details.  If left empty this property will not be set in the request.
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+    {
+        $dupValue = $allowDups ? 'true' : 'false';
+        $pendingValue = $overwritePending ? 'true' : 'false';
+        $committedValue = $overwriteCommitted ? 'true' : 'false';
+
+        $commitWithin = (int) $commitWithin;
+        $commitWithinString = $commitWithin > 0 ? " commitWithin=\"{$commitWithin}\"" : '';
+
+        $rawPost = "<add allowDups=\"{$dupValue}\" overwritePending=\"{$pendingValue}\" overwriteCommitted=\"{$committedValue}\"{$commitWithinString}>";
+
+        foreach ($documents as $document)
+        {
+            if ($document instanceof Apache_Solr_Document)
+            {
+                $rawPost .= $this->_documentToXmlFragment($document);
+            }
+        }
+
+        $rawPost .= '</add>';
+
+        return $this->add($rawPost);
+    }
+
+    /**
+     * Create an XML fragment from a {@link Apache_Solr_Document} instance appropriate for use inside a Solr add call
+     *
+     * @return string
+     */
+    protected function _documentToXmlFragment(Apache_Solr_Document $document)
+    {
+        $xml = '<doc';
+
+        if ($document->getBoost() !== false)
+        {
+            $xml .= ' boost="' . $document->getBoost() . '"';
+        }
+
+        $xml .= '>';
+
+        foreach ($document as $key => $value)
+        {
+            $key = htmlspecialchars($key, ENT_QUOTES, 'UTF-8');
+            $fieldBoost = $document->getFieldBoost($key);
+
+            if (is_array($value))
+            {
+                foreach ($value as $multivalue)
+                {
+                    $xml .= '<field name="' . $key . '"';
+
+                    if ($fieldBoost !== false)
+                    {
+                        $xml .= ' boost="' . $fieldBoost . '"';
+
+                        // only set the boost for the first field in the set
+                        $fieldBoost = false;
+                    }
+
+                    $multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
+
+                    $xml .= '>' . $multivalue . '</field>';
+                }
+            }
+            else
+            {
+                $xml .= '<field name="' . $key . '"';
+
+                if ($fieldBoost !== false)
+                {
+                    $xml .= ' boost="' . $fieldBoost . '"';
+                }
+
+                $value = htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
+
+                $xml .= '>' . $value . '</field>';
+            }
+        }
+
+        $xml .= '</doc>';
+
+        // replace any control characters to avoid Solr XML parser exception
+        return $this->_stripCtrlChars($xml);
+    }
+
+    /**
+     * Replace control (non-printable) characters from string that are invalid to Solr's XML parser with a space.
+     *
+     * @param string $string
+     * @return string
+     */
+    protected function _stripCtrlChars($string)
+    {
+        // See:  http://w3.org/International/questions/qa-forms-utf-8.html
+        // Printable utf-8 does not include any of these chars below x7F
+        return preg_replace('@[\x00-\x08\x0B\x0C\x0E-\x1F]@', ' ', $string);
+    }
+
+    /**
+     * Send a commit command.  Will be synchronous unless both wait parameters are set to false.
+     *
+     * @param boolean $expungeDeletes Defaults to false, merge segments with deletes away
+     * @param boolean $waitFlush Defaults to true,  block until index changes are flushed to disk
+     * @param boolean $waitSearcher Defaults to true, block until a new searcher is opened and registered as the main query searcher, making the changes visible
+     * @param float $timeout Maximum expected duration (in seconds) of the commit operation on the server (otherwise, will throw a communication exception). Defaults to 1 hour
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+    {
+        $expungeValue = $expungeDeletes ? 'true' : 'false';
+        $flushValue = $waitFlush ? 'true' : 'false';
+        $searcherValue = $waitSearcher ? 'true' : 'false';
+
+        $rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+
+        return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
+    }
+
+    /**
+     * Raw Delete Method. Takes a raw post body and sends it to the update service. Body should be
+     * a complete and well formed "delete" xml document
+     *
+     * @param string $rawPost Expected to be utf-8 encoded xml document
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function delete($rawPost, $timeout = 3600)
+    {
+        return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
+    }
+
+    /**
+     * Create a delete document based on document ID
+     *
+     * @param string $id Expected to be utf-8 encoded
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $pendingValue = $fromPending ? 'true' : 'false';
+        $committedValue = $fromCommitted ? 'true' : 'false';
+
+        //escape special xml characters
+        $id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
+
+        $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><id>' . $id . '</id></delete>';
+
+        return $this->delete($rawPost, $timeout);
+    }
+
+    /**
+     * Create and post a delete document based on multiple document IDs.
+     *
+     * @param array $ids Expected to be utf-8 encoded strings
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $pendingValue = $fromPending ? 'true' : 'false';
+        $committedValue = $fromCommitted ? 'true' : 'false';
+
+        $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">';
+
+        foreach ($ids as $id)
+        {
+            //escape special xml characters
+            $id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
+
+            $rawPost .= '<id>' . $id . '</id>';
+        }
+
+        $rawPost .= '</delete>';
+
+        return $this->delete($rawPost, $timeout);
+    }
+
+    /**
+     * Create a delete document based on a query and submit it
+     *
+     * @param string $rawQuery Expected to be utf-8 encoded
+     * @param boolean $fromPending
+     * @param boolean $fromCommitted
+     * @param float $timeout Maximum expected duration of the delete operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+    {
+        $pendingValue = $fromPending ? 'true' : 'false';
+        $committedValue = $fromCommitted ? 'true' : 'false';
+
+        // escape special xml characters
+        $rawQuery = htmlspecialchars($rawQuery, ENT_NOQUOTES, 'UTF-8');
+
+        $rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><query>' . $rawQuery . '</query></delete>';
+
+        return $this->delete($rawPost, $timeout);
+    }
+
+    /**
+     * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
+     * to use Solr Cell and what parameters are available.
+     *
+     * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
+     * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
+     * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
+     * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
+     *
+     * @param string $file Path to file to extract data from
+     * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
+     * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
+     * @param string $mimetype optional mimetype specification (for the file being extracted)
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
+     */
+    public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+    {
+        // check if $params is an array (allow null for default empty array)
+        if (!is_null($params))
+        {
+            if (!is_array($params))
+            {
+                throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
+            }
+        }
+        else
+        {
+            $params = array();
+        }
 		
-		// if $file is an http request, defer to extractFromUrl instead
-		if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://')
-		{
-			return $this->extractFromUrl($file, $params, $document, $mimetype);
-		}
+        // if $file is an http request, defer to extractFromUrl instead
+        if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://')
+        {
+            return $this->extractFromUrl($file, $params, $document, $mimetype);
+        }
 		
-		// read the contents of the file
-		$contents = @file_get_contents($file);
-
-		if ($contents !== false)
-		{
-			// add the resource.name parameter if not specified
-			if (!isset($params['resource.name']))
-			{
-				$params['resource.name'] = basename($file);
-			}
-
-			// delegate the rest to extractFromString
-			return $this->extractFromString($contents, $params, $document, $mimetype);
-		}
-		else
-		{
-			throw new Apache_Solr_InvalidArgumentException("File '{$file}' is empty or could not be read");
-		}
-	}
+        // read the contents of the file
+        $contents = @file_get_contents($file);
+
+        if ($contents !== false)
+        {
+            // add the resource.name parameter if not specified
+            if (!isset($params['resource.name']))
+            {
+                $params['resource.name'] = basename($file);
+            }
+
+            // delegate the rest to extractFromString
+            return $this->extractFromString($contents, $params, $document, $mimetype);
+        }
+        else
+        {
+            throw new Apache_Solr_InvalidArgumentException("File '{$file}' is empty or could not be read");
+        }
+    }
 	
-	/**
-	 * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
-	 * to use Solr Cell and what parameters are available.
-	 *
-	 * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
-	 * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
-	 * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
-	 * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
-	 *
-	 * @param string $data Data that will be passed to Solr Cell
-	 * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
-	 * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
-	 * @param string $mimetype optional mimetype specification (for the file being extracted)
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
-	 *
-	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
-	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
-		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
-				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
-			}
-		}
-		else
-		{
-			$params = array();
-		}
-
-		// make sure we receive our response in JSON and have proper name list treatment
-		$params['wt'] = self::SOLR_WRITER;
-		$params['json.nl'] = $this->_namedListTreatment;
-
-		// check if $document is an Apache_Solr_Document instance
-		if (!is_null($document) && $document instanceof Apache_Solr_Document)
-		{
-			// iterate document, adding literal.* and boost.* fields to $params as appropriate
-			foreach ($document as $field => $fieldValue)
-			{
-				// check if we need to add a boost.* parameters
-				$fieldBoost = $document->getFieldBoost($field);
-
-				if ($fieldBoost !== false)
-				{
-					$params["boost.{$field}"] = $fieldBoost;
-				}
-
-				// add the literal.* parameter
-				$params["literal.{$field}"] = $fieldValue;
-			}
-		}
-
-		// params will be sent to SOLR in the QUERY STRING
-		$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);
-	}
+    /**
+     * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
+     * to use Solr Cell and what parameters are available.
+     *
+     * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
+     * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
+     * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
+     * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
+     *
+     * @param string $data Data that will be passed to Solr Cell
+     * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
+     * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
+     * @param string $mimetype optional mimetype specification (for the file being extracted)
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
+     *
+     * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
+     */
+    public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+    {
+        // check if $params is an array (allow null for default empty array)
+        if (!is_null($params))
+        {
+            if (!is_array($params))
+            {
+                throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
+            }
+        }
+        else
+        {
+            $params = array();
+        }
+
+        // make sure we receive our response in JSON and have proper name list treatment
+        $params['wt'] = self::SOLR_WRITER;
+        $params['json.nl'] = $this->_namedListTreatment;
+
+        // check if $document is an Apache_Solr_Document instance
+        if (!is_null($document) && $document instanceof Apache_Solr_Document)
+        {
+            // iterate document, adding literal.* and boost.* fields to $params as appropriate
+            foreach ($document as $field => $fieldValue)
+            {
+                // check if we need to add a boost.* parameters
+                $fieldBoost = $document->getFieldBoost($field);
+
+                if ($fieldBoost !== false)
+                {
+                    $params["boost.{$field}"] = $fieldBoost;
+                }
+
+                // add the literal.* parameter
+                $params["literal.{$field}"] = $fieldValue;
+            }
+        }
+
+        // params will be sent to SOLR in the QUERY STRING
+        $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);
+    }
 	
-	/**
-	 * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
-	 * to use Solr Cell and what parameters are available.
-	 *
-	 * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
-	 * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
-	 * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
-	 * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
-	 *
-	 * @param string $url URL
-	 * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
-	 * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
-	 * @param string $mimetype optional mimetype specification (for the file being extracted)
-	 *
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
-	 */
-	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
-	{
-		// check if $params is an array (allow null for default empty array)
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
-				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
-			}
-		}
-		else
-		{
-			$params = array();
-		}
-
-		$httpTransport = $this->getHttpTransport();
+    /**
+     * Use Solr Cell to extract document contents. See {@link http://wiki.apache.org/solr/ExtractingRequestHandler} for information on how
+     * to use Solr Cell and what parameters are available.
+     *
+     * NOTE: when passing an Apache_Solr_Document instance, field names and boosts will automatically be prepended by "literal." and "boost."
+     * as appropriate. Any keys from the $params array will NOT be treated this way. Any mappings from the document will overwrite key / value
+     * pairs in the params array if they have the same name (e.g. you pass a "literal.id" key and value in your $params array but you also
+     * pass in a document isntance with an "id" field" - the document's value(s) will take precedence).
+     *
+     * @param string $url URL
+     * @param array $params optional array of key value pairs that will be sent with the post (see Solr Cell documentation)
+     * @param Apache_Solr_Document $document optional document that will be used to generate post parameters (literal.* and boost.* params)
+     * @param string $mimetype optional mimetype specification (for the file being extracted)
+     *
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
+     */
+    public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+    {
+        // check if $params is an array (allow null for default empty array)
+        if (!is_null($params))
+        {
+            if (!is_array($params))
+            {
+                throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
+            }
+        }
+        else
+        {
+            $params = array();
+        }
+
+        $httpTransport = $this->getHttpTransport();
 		
-		// read the contents of the URL using our configured Http Transport and default timeout
-		$httpResponse = $httpTransport->performGetRequest($url);
+        // read the contents of the URL using our configured Http Transport and default timeout
+        $httpResponse = $httpTransport->performGetRequest($url);
 		
-		// check that its a 200 response
-		if ($httpResponse->getStatusCode() == 200)
-		{
-			// add the resource.name parameter if not specified
-			if (!isset($params['resource.name']))
-			{
-				$params['resource.name'] = $url;
-			}
-
-			// delegate the rest to extractFromString
-			return $this->extractFromString($httpResponse->getBody(), $params, $document, $mimetype);
-		}
-		else
-		{
-			throw new Apache_Solr_InvalidArgumentException("URL '{$url}' returned non 200 response code");
-		}
-	}
-
-	/**
-	 * Send an optimize command.  Will be synchronous unless both wait parameters are set
-	 * to false.
-	 *
-	 * @param boolean $waitFlush
-	 * @param boolean $waitSearcher
-	 * @param float $timeout Maximum expected duration of the commit operation on the server (otherwise, will throw a communication exception)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
-	{
-		$flushValue = $waitFlush ? 'true' : 'false';
-		$searcherValue = $waitSearcher ? 'true' : 'false';
-
-		$rawPost = '<optimize waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
-
-		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
-	}
-
-	/**
-	 * Simple Search interface
-	 *
-	 * @param string $query The raw query string
-	 * @param int $offset The starting offset for result documents
-	 * @param int $limit The maximum number of result documents to return
-	 * @param array $params key / value pairs for other query parameters (see Solr documentation), use arrays for parameter keys used more than once (e.g. facet.field)
-	 * @param string $method The HTTP method (Apache_Solr_Service::METHOD_GET or Apache_Solr_Service::METHOD::POST)
-	 * @return Apache_Solr_Response
-	 *
-	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
-	 * @throws Apache_Solr_InvalidArgumentException If an invalid HTTP method is used
-	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = self::METHOD_GET)
-	{
-		// ensure params is an array
-		if (!is_null($params))
-		{
-			if (!is_array($params))
-			{
-				// params was specified but was not an array - invalid
-				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
-			}
-		}
-		else
-		{
-			$params = array();
-		}
+        // check that its a 200 response
+        if ($httpResponse->getStatusCode() == 200)
+        {
+            // add the resource.name parameter if not specified
+            if (!isset($params['resource.name']))
+            {
+                $params['resource.name'] = $url;
+            }
+
+            // delegate the rest to extractFromString
+            return $this->extractFromString($httpResponse->getBody(), $params, $document, $mimetype);
+        }
+        else
+        {
+            throw new Apache_Solr_InvalidArgumentException("URL '{$url}' returned non 200 response code");
+        }
+    }
+
+    /**
+     * Send an optimize command.  Will be synchronous unless both wait parameters are set
+     * to false.
+     *
+     * @param boolean $waitFlush
+     * @param boolean $waitSearcher
+     * @param float $timeout Maximum expected duration of the commit operation on the server (otherwise, will throw a communication exception)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     */
+    public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+    {
+        $flushValue = $waitFlush ? 'true' : 'false';
+        $searcherValue = $waitSearcher ? 'true' : 'false';
+
+        $rawPost = '<optimize waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+
+        return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
+    }
+
+    /**
+     * Simple Search interface
+     *
+     * @param string $query The raw query string
+     * @param int $offset The starting offset for result documents
+     * @param int $limit The maximum number of result documents to return
+     * @param array $params key / value pairs for other query parameters (see Solr documentation), use arrays for parameter keys used more than once (e.g. facet.field)
+     * @param string $method The HTTP method (Apache_Solr_Service::METHOD_GET or Apache_Solr_Service::METHOD::POST)
+     * @return Apache_Solr_Response
+     *
+     * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
+     * @throws Apache_Solr_InvalidArgumentException If an invalid HTTP method is used
+     */
+    public function search($query, $offset = 0, $limit = 10, $params = array(), $method = self::METHOD_GET)
+    {
+        // ensure params is an array
+        if (!is_null($params))
+        {
+            if (!is_array($params))
+            {
+                // params was specified but was not an array - invalid
+                throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
+            }
+        }
+        else
+        {
+            $params = array();
+        }
 		
-		// construct our full parameters
-
-		// common parameters in this interface
-		$params['wt'] = self::SOLR_WRITER;
-		$params['json.nl'] = $this->_namedListTreatment;
-
-		$params['q'] = $query;
-		$params['start'] = $offset;
-		$params['rows'] = $limit;
-
-		$queryString = $this->_generateQueryString($params);
-
-		if ($method == self::METHOD_GET)
-		{
-			return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
-		}
-		else if ($method == self::METHOD_POST)
-		{
-			return $this->_sendRawPost($this->_searchUrl, $queryString, FALSE, 'application/x-www-form-urlencoded; charset=UTF-8');
-		}
-		else
-		{
-			throw new Apache_Solr_InvalidArgumentException("Unsupported method '$method', please use the Apache_Solr_Service::METHOD_* constants");
-		}
-	}
+        // construct our full parameters
+
+        // common parameters in this interface
+        $params['wt'] = self::SOLR_WRITER;
+        $params['json.nl'] = $this->_namedListTreatment;
+
+        $params['q'] = $query;
+        $params['start'] = $offset;
+        $params['rows'] = $limit;
+
+        $queryString = $this->_generateQueryString($params);
+
+        if ($method == self::METHOD_GET)
+        {
+            return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
+        }
+        else if ($method == self::METHOD_POST)
+        {
+            return $this->_sendRawPost($this->_searchUrl, $queryString, FALSE, 'application/x-www-form-urlencoded; charset=UTF-8');
+        }
+        else
+        {
+            throw new Apache_Solr_InvalidArgumentException("Unsupported method '$method', please use the Apache_Solr_Service::METHOD_* constants");
+        }
+    }
 }
\ No newline at end of file

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

Indentation +33 added lines, -33 removed lines

@@ -38,42 +38,42 @@
 
 class Apache_Solr_HttpTransportException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: HttpTransportException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: HttpTransportException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	/**
-	 * Response for which exception was generated
-	 *
-	 * @var Apache_Solr_Response
-	 */
-	private $_response;
+    /**
+     * Response for which exception was generated
+     *
+     * @var Apache_Solr_Response
+     */
+    private $_response;
 
-	/**
-	 * HttpTransportException Constructor
-	 *
-	 * @param Apache_Solr_Response $response
-	 */
-	public function __construct(Apache_Solr_Response $response)
-	{
-		parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
+    /**
+     * HttpTransportException Constructor
+     *
+     * @param Apache_Solr_Response $response
+     */
+    public function __construct(Apache_Solr_Response $response)
+    {
+        parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
 
-		$this->_response = $response;
-	}
+        $this->_response = $response;
+    }
 
-	/**
-	 * Get the response for which this exception was generated
-	 *
-	 * @return Apache_Solr_Response
-	 */
-	public function getResponse()
-	{
-		return $this->_response;
-	}
+    /**
+     * Get the response for which this exception was generated
+     *
+     * @return Apache_Solr_Response
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
 }
\ No newline at end of file

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

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_Exception extends Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Exception.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Exception.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file