kitodo / kitodo-presentation

dlf/plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
 			// Set default values if not set.
 			// $this->piVars['page'] may be integer or string (physical structure @ID)
-			if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
+			if ((int) $this->piVars['page'] > 0 || empty($this->piVars['page'])) {
 
 				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
 
@@ -84,7 +84,7 @@ 
 					.$this->pi_getLL('fulltext-on', '', TRUE).';fulltext-off:'
 					.$this->pi_getLL('fulltext-off', '', TRUE).'">&nbsp;</a>';
 		} else {
-			$markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">' . $this->pi_getLL('fulltext-not-available', '', TRUE) . '</span>';
+			$markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">'.$this->pi_getLL('fulltext-not-available', '', TRUE).'</span>';
 		}
 
 		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);

Indentation +52 added lines, -52 removed lines

@@ -20,85 +20,85 @@
  */
 class tx_dlf_toolsFulltext extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php';
+    public $scriptRelPath = 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php';
 
-	/**
-	 * The main method of the PlugIn
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: The PlugIn content
-	 * @param	array		$conf: The PlugIn configuration
-	 *
-	 * @return	string		The content that is displayed on the website
-	 */
-	public function main($content, $conf) {
+    /**
+     * The main method of the PlugIn
+     *
+     * @access	public
+     *
+     * @param	string		$content: The PlugIn content
+     * @param	array		$conf: The PlugIn configuration
+     *
+     * @return	string		The content that is displayed on the website
+     */
+    public function main($content, $conf) {
 
-		$this->init($conf);
+        $this->init($conf);
 
-		// Merge configuration with conf array of toolbox.
-		$this->conf = tx_dlf_helper::array_merge_recursive_overrule($this->cObj->data['conf'], $this->conf);
+        // Merge configuration with conf array of toolbox.
+        $this->conf = tx_dlf_helper::array_merge_recursive_overrule($this->cObj->data['conf'], $this->conf);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext'])) {
+        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext'])) {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		} else {
+        } else {
 
-			if (!empty($this->piVars['logicalPage'])) {
+            if (!empty($this->piVars['logicalPage'])) {
 
-				$this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
-				// The logical page parameter should not appear again
-				unset($this->piVars['logicalPage']);
+                $this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
+                // The logical page parameter should not appear again
+                unset($this->piVars['logicalPage']);
 
-			}
+            }
 
-			// Set default values if not set.
-			// $this->piVars['page'] may be integer or string (physical structure @ID)
-			if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
+            // Set default values if not set.
+            // $this->piVars['page'] may be integer or string (physical structure @ID)
+            if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
 
-				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
+                $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
 
-			} else {
+            } else {
 
-				$this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
+                $this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
 
-			}
+            }
 
-			$this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
+            $this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
 
-		}
+        }
 
-		// Load template file.
-		if (!empty($this->conf['toolTemplateFile'])) {
+        // Load template file.
+        if (!empty($this->conf['toolTemplateFile'])) {
 
-			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['toolTemplateFile']), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['toolTemplateFile']), '###TEMPLATE###');
 
-		} else {
+        } else {
 
-			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/toolbox/tools/fulltext/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/toolbox/tools/fulltext/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
 
-		$fullTextFile = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpFulltext']];
+        $fullTextFile = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpFulltext']];
 
-		if (!empty($fullTextFile)) {
-			$markerArray['###FULLTEXT_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-fulltext" title="" data-dic="fulltext-on:'
-					.$this->pi_getLL('fulltext-on', '', TRUE).';fulltext-off:'
-					.$this->pi_getLL('fulltext-off', '', TRUE).'">&nbsp;</a>';
-		} else {
-			$markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">' . $this->pi_getLL('fulltext-not-available', '', TRUE) . '</span>';
-		}
+        if (!empty($fullTextFile)) {
+            $markerArray['###FULLTEXT_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-fulltext" title="" data-dic="fulltext-on:'
+                    .$this->pi_getLL('fulltext-on', '', TRUE).';fulltext-off:'
+                    .$this->pi_getLL('fulltext-off', '', TRUE).'">&nbsp;</a>';
+        } else {
+            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">' . $this->pi_getLL('fulltext-not-available', '', TRUE) . '</span>';
+        }
 
-		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
+        $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
 }

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

Spacing +1 added lines, -1 removed lines

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

Indentation +41 added lines, -41 removed lines

@@ -46,49 +46,49 @@
  */
 interface Apache_Solr_HttpTransport_Interface
 {
-	/**
-	 * Get the current default timeout for all HTTP requests
-	 *
-	 * @return float
-	 */
-	public function getDefaultTimeout();
+    /**
+     * Get the current default timeout for all HTTP requests
+     *
+     * @return float
+     */
+    public function getDefaultTimeout();
 	
-	/**
-	 * Set the current default timeout for all HTTP requests
-	 *
-	 * @param float $timeout
-	 */
-	public function setDefaultTimeout($timeout);
+    /**
+     * Set the current default timeout for all HTTP requests
+     *
+     * @param float $timeout
+     */
+    public function setDefaultTimeout($timeout);
 		
-	/**
-	 * Perform a GET HTTP operation with an optional timeout and return the response
-	 * contents, use getLastResponseHeaders to retrieve HTTP headers
-	 *
-	 * @param string $url
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performGetRequest($url, $timeout = false);
+    /**
+     * Perform a GET HTTP operation with an optional timeout and return the response
+     * contents, use getLastResponseHeaders to retrieve HTTP headers
+     *
+     * @param string $url
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performGetRequest($url, $timeout = false);
 	
-	/**
-	 * Perform a HEAD HTTP operation with an optional timeout and return the response
-	 * headers - NOTE: head requests have no response body
-	 *
-	 * @param string $url
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performHeadRequest($url, $timeout = false);
+    /**
+     * Perform a HEAD HTTP operation with an optional timeout and return the response
+     * headers - NOTE: head requests have no response body
+     *
+     * @param string $url
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performHeadRequest($url, $timeout = false);
 	
-	/**
-	 * Perform a POST HTTP operation with an optional timeout and return the response
-	 * contents, use getLastResponseHeaders to retrieve HTTP headers
-	 *
-	 * @param string $url
-	 * @param string $rawPost
-	 * @param string $contentType
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
+    /**
+     * Perform a POST HTTP operation with an optional timeout and return the response
+     * contents, use getLastResponseHeaders to retrieve HTTP headers
+     *
+     * @param string $url
+     * @param string $rawPost
+     * @param string $contentType
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

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

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performGetRequest($url, $timeout = false);
+	public function performGetRequest($url, $timeout = FALSE);
 	
 	/**
 	 * Perform a HEAD HTTP operation with an optional timeout and return the response
@@ -78,7 +78,7 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performHeadRequest($url, $timeout = false);
+	public function performHeadRequest($url, $timeout = FALSE);
 	
 	/**
 	 * Perform a POST HTTP operation with an optional timeout and return the response
@@ -90,5 +90,5 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = FALSE);
 }
\ No newline at end of file

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

Spacing +7 added lines, -7 removed lines

@@ -79,14 +79,14 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_fields = array();
+	protected $_fields = array ();
 
 	/**
 	 * Document field boost values, indexed by name
 	 *
 	 * @var array array of floats
 	 */
-	protected $_fieldBoosts = array();
+	protected $_fieldBoosts = array ();
 
 	/**
 	 * Clear all boosts and fields from this document
@@ -95,8 +95,8 @@ 
 	{
 		$this->_documentBoost = false;
 
-		$this->_fields = array();
-		$this->_fieldBoosts = array();
+		$this->_fields = array ();
+		$this->_fieldBoosts = array ();
 	}
 
 	/**
@@ -156,12 +156,12 @@ 
 		if (!isset($this->_fields[$key]))
 		{
 			// create holding array if this is the first value
-			$this->_fields[$key] = array();
+			$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]);
+			$this->_fields[$key] = array ($this->_fields[$key]);
 		}
 
 		if ($this->getFieldBoost($key) === false)
@@ -203,7 +203,7 @@ 
 	{
 		if (isset($this->_fields[$key]))
 		{
-			return array(
+			return array (
 				'name' => $key,
 				'value' => $this->_fields[$key],
 				'boost' => $this->getFieldBoost($key)

Braces +28 added lines, -60 removed lines

@@ -55,8 +55,7 @@ 
  * }
  * </code>
  */
-class Apache_Solr_Document implements IteratorAggregate
-{
+class Apache_Solr_Document implements IteratorAggregate {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -91,8 +90,7 @@ 
 	/**
 	 * Clear all boosts and fields from this document
 	 */
-	public function clear()
-	{
+	public function clear() {
 		$this->_documentBoost = false;
 
 		$this->_fields = array();
@@ -104,8 +102,7 @@ 
 	 *
 	 * @return mixed will be false for default, or else a float
 	 */
-	public function getBoost()
-	{
+	public function getBoost() {
 		return $this->_documentBoost;
 	}
 
@@ -114,16 +111,12 @@ 
 	 *
 	 * @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)
-	{
+	public function setBoost($boost) {
 		$boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
+		if ($boost > 0.0) {
 			$this->_documentBoost = $boost;
-		}
-		else
-		{
+		} else {
 			$this->_documentBoost = false;
 		}
 	}
@@ -151,26 +144,19 @@ 
 	 * @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]))
-		{
+	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]))
-		{
+		} 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)
-		{
+		if ($this->getFieldBoost($key) === false) {
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
-		{
+		} else if ((float) $boost > 0.0) {
 			// multiply passed boost with current field boost - similar to SolrJ implementation
 			$this->_fieldBoosts[$key] *= (float) $boost;
 		}
@@ -188,8 +174,7 @@ 
 	 *
 	 * @deprecated Use addField(...) instead
 	 */
-	public function setMultiValue($key, $value, $boost = false)
-	{
+	public function setMultiValue($key, $value, $boost = false) {
 		$this->addField($key, $value, $boost);
 	}
 
@@ -199,10 +184,8 @@ 
 	 * @param string $key
 	 * @return mixed associative array of info if field exists, false otherwise
 	 */
-	public function getField($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
+	public function getField($key) {
+		if (isset($this->_fields[$key])) {
 			return array(
 				'name' => $key,
 				'value' => $this->_fields[$key],
@@ -222,8 +205,7 @@ 
 	 * @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)
-	{
+	public function setField($key, $value, $boost = false) {
 		$this->_fields[$key] = $value;
 		$this->setFieldBoost($key, $boost);
 	}
@@ -234,8 +216,7 @@ 
 	 * @param string $key
 	 * @return float currently set field boost, false if one is not set
 	 */
-	public function getFieldBoost($key)
-	{
+	public function getFieldBoost($key) {
 		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
 	}
 
@@ -245,16 +226,12 @@ 
 	 * @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)
-	{
+	public function setFieldBoost($key, $boost) {
 		$boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
+		if ($boost > 0.0) {
 			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
-		{
+		} else {
 			$this->_fieldBoosts[$key] = false;
 		}
 	}
@@ -264,8 +241,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldBoosts()
-	{
+	public function getFieldBoosts() {
 		return $this->_fieldBoosts;
 	}
 
@@ -274,8 +250,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldNames()
-	{
+	public function getFieldNames() {
 		return array_keys($this->_fields);
 	}
 
@@ -284,8 +259,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldValues()
-	{
+	public function getFieldValues() {
 		return array_values($this->_fields);
 	}
 
@@ -299,8 +273,7 @@ 
 	 * }
 	 * </code>
 	 */
-	public function getIterator()
-	{
+	public function getIterator() {
 		$arrayObject = new ArrayObject($this->_fields);
 
 		return $arrayObject->getIterator();
@@ -312,10 +285,8 @@ 
 	 * @param string $key
 	 * @return mixed
 	 */
-	public function __get($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
+	public function __get($key) {
+		if (isset($this->_fields[$key])) {
 			return $this->_fields[$key];
 		}
 		
@@ -330,8 +301,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	public function __set($key, $value)
-	{
+	public function __set($key, $value) {
 		$this->setField($key, $value);
 	}
 
@@ -345,8 +315,7 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	public function __isset($key)
-	{
+	public function __isset($key) {
 		return isset($this->_fields[$key]);
 	}
 
@@ -359,8 +328,7 @@ 
 	 *
 	 * @param string $key
 	 */
-	public function __unset($key)
-	{
+	public function __unset($key) {
 		unset($this->_fields[$key]);
 		unset($this->_fieldBoosts[$key]);
 	}

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @var float
 	 */
-	protected $_documentBoost = false;
+	protected $_documentBoost = FALSE;
 
 	/**
 	 * Document field values, indexed by name
@@ -93,7 +93,7 @@ 
 	 */
 	public function clear()
 	{
-		$this->_documentBoost = false;
+		$this->_documentBoost = FALSE;
 
 		$this->_fields = array();
 		$this->_fieldBoosts = array();
@@ -124,7 +124,7 @@ 
 		}
 		else
 		{
-			$this->_documentBoost = false;
+			$this->_documentBoost = FALSE;
 		}
 	}
 
@@ -151,7 +151,7 @@ 
 	 * @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)
+	public function addField($key, $value, $boost = FALSE)
 	{
 		if (!isset($this->_fields[$key]))
 		{
@@ -164,7 +164,7 @@ 
 			$this->_fields[$key] = array($this->_fields[$key]);
 		}
 
-		if ($this->getFieldBoost($key) === false)
+		if ($this->getFieldBoost($key) === FALSE)
 		{
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
@@ -188,7 +188,7 @@ 
 	 *
 	 * @deprecated Use addField(...) instead
 	 */
-	public function setMultiValue($key, $value, $boost = false)
+	public function setMultiValue($key, $value, $boost = FALSE)
 	{
 		$this->addField($key, $value, $boost);
 	}
@@ -210,7 +210,7 @@ 
 			);
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 * @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)
+	public function setField($key, $value, $boost = FALSE)
 	{
 		$this->_fields[$key] = $value;
 		$this->setFieldBoost($key, $boost);
@@ -236,7 +236,7 @@ 
 	 */
 	public function getFieldBoost($key)
 	{
-		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
+		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : FALSE;
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 		}
 		else
 		{
-			$this->_fieldBoosts[$key] = false;
+			$this->_fieldBoosts[$key] = FALSE;
 		}
 	}
 
@@ -319,7 +319,7 @@ 
 			return $this->_fields[$key];
 		}
 		
-		return null;
+		return NULL;
 	}
 
 	/**

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

Braces +1 added lines, -2 removed lines

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

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

Braces +1 added lines, -2 removed lines

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

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

Spacing +20 added lines, -20 removed lines

@@ -38,9 +38,9 @@ 
 
 // See Issue #1 (http://code.google.com/p/solr-php-client/issues/detail?id=1)
 // Doesn't follow typical include path conventions, but is more convenient for users
-require_once(dirname(dirname(__FILE__)) . '/Service.php');
+require_once(dirname(dirname(__FILE__)).'/Service.php');
 
-require_once(dirname(dirname(__FILE__)) . '/NoServiceAvailableException.php');
+require_once(dirname(dirname(__FILE__)).'/NoServiceAvailableException.php');
 
 /**
  * Reference Implementation for using multiple Solr services in a distribution. Functionality
@@ -62,8 +62,8 @@ 
 
 	protected $_createDocuments = true;
 
-	protected $_readableServices = array();
-	protected $_writeableServices = array();
+	protected $_readableServices = array ();
+	protected $_writeableServices = array ();
 
 	protected $_currentReadService = null;
 	protected $_currentWriteService = null;
@@ -72,10 +72,10 @@ 
 	protected $_writePingTimeout = 4;
 
 	// Configuration for server selection backoff intervals
-	protected $_useBackoff = false;		// Set to true to use more resillient write server selection
-	protected $_backoffLimit = 600;		// 10 minute default maximum
-	protected $_backoffEscalation = 2.0; 	// Rate at which to increase backoff period
-	protected $_defaultBackoff = 2.0;		// Default backoff interval
+	protected $_useBackoff = false; // Set to true to use more resillient write server selection
+	protected $_backoffLimit = 600; // 10 minute default maximum
+	protected $_backoffEscalation = 2.0; // Rate at which to increase backoff period
+	protected $_defaultBackoff = 2.0; // Default backoff interval
 
 	/**
 	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
@@ -118,7 +118,7 @@ 
 	 * @param array $readableServices
 	 * @param array $writeableServices
 	 */
-	public function __construct($readableServices = array(), $writeableServices = array())
+	public function __construct($readableServices = array (), $writeableServices = array ())
 	{
 		//setup readable services
 		foreach ($readableServices as $service)
@@ -158,7 +158,7 @@ 
 	 */
 	protected function _getServiceId($host, $port, $path)
 	{
-		return $host . ':' . $port . $path;
+		return $host.':'.$port.$path;
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 
 				$this->_readableServices[$id] = $service;
 			}
@@ -211,7 +211,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 			}
 			else
 			{
@@ -249,7 +249,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 
 				$this->_writeableServices[$id] = $service;
 			}
@@ -279,7 +279,7 @@ 
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
-				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
+				$id = $this->_getServiceId((string) $service['host'], (int) $service['port'], (string) $service['path']);
 			}
 			else
 			{
@@ -355,7 +355,7 @@ 
 	 */
 	protected function _selectWriteService($forceSelect = false)
 	{
-		if($this->_useBackoff)
+		if ($this->_useBackoff)
 		{
 			return $this->_selectWriteServiceSafe($forceSelect);
 		}
@@ -435,12 +435,12 @@ 
 
 					$backoff *= $this->_backoffEscalation;
 
-					if($backoff > $this->_backoffLimit)
+					if ($backoff > $this->_backoffLimit)
 					{
 						throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
 					}
 
-				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
+				} while ($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
 			}
 			else
 			{
@@ -773,7 +773,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array (), $document = null, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -817,7 +817,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array (), $document = null, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -888,7 +888,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = Apache_Solr_Service::METHOD_GET)
+	public function search($query, $offset = 0, $limit = 10, $params = array (), $method = Apache_Solr_Service::METHOD_GET)
 	{
 		$service = $this->_selectReadService();
 

Braces +143 added lines, -251 removed lines

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

Upper-Lower-Casing +43 added lines, -43 removed lines

@@ -60,19 +60,19 @@ 
 	 */
 	const SVN_ID = '$Id: Balancer.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	protected $_createDocuments = true;
+	protected $_createDocuments = TRUE;
 
 	protected $_readableServices = array();
 	protected $_writeableServices = array();
 
-	protected $_currentReadService = null;
-	protected $_currentWriteService = null;
+	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 $_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
@@ -305,14 +305,14 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no read services that meet requirements
 	 */
-	protected function _selectReadService($forceSelect = false)
+	protected function _selectReadService($forceSelect = FALSE)
 	{
 		if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect)
 		{
 			if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect)
 			{
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false)
+				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === FALSE)
 				{
 					$this->removeReadService($this->_currentReadService);
 				}
@@ -353,7 +353,7 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
-	protected function _selectWriteService($forceSelect = false)
+	protected function _selectWriteService($forceSelect = FALSE)
 	{
 		if($this->_useBackoff)
 		{
@@ -365,7 +365,7 @@ 
 			if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect)
 			{
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false)
+				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === FALSE)
 				{
 					$this->removeWriteService($this->_currentWriteService);
 				}
@@ -409,7 +409,7 @@ 
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
 
-	protected function _selectWriteServiceSafe($forceSelect = false)
+	protected function _selectWriteServiceSafe($forceSelect = FALSE)
 	{
 		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
 		{
@@ -440,7 +440,7 @@ 
 						throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
 					}
 
-				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
+				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === FALSE);
 			}
 			else
 			{
@@ -506,10 +506,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -523,7 +523,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+	public function addDocument(Apache_Solr_Document $document, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE)
 	{
 		$service = $this->_selectWriteService();
 
@@ -541,10 +541,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -558,7 +558,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+	public function addDocuments($documents, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE)
 	{
 		$service = $this->_selectWriteService();
 
@@ -576,10 +576,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function commit($optimize = TRUE, $waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -610,10 +610,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -644,10 +644,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteById($id, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -679,10 +679,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -696,7 +696,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByMultipleIds($ids, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -714,10 +714,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -731,7 +731,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByQuery($rawQuery, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -749,10 +749,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -773,7 +773,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -791,10 +791,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -817,7 +817,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -835,10 +835,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -852,7 +852,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function optimize($waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -870,10 +870,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -906,9 +906,9 @@ 
 				}
 			}
 
-			$service = $this->_selectReadService(true);
+			$service = $this->_selectReadService(TRUE);
 		} while ($service);
 
-		return false;
+		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

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-require_once(dirname(__FILE__) . '/ParserException.php');
+require_once(dirname(__FILE__).'/ParserException.php');
 
 /**
  * Represents a Solr response.  Parses the raw response into a set of stdClass objects
@@ -210,7 +210,7 @@ 
 		//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();
+			$documents = array ();
 
 			foreach ($data->response->docs as $originalDocument)
 			{

Braces +20 added lines, -41 removed lines

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

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -69,7 +69,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_isParsed = false;
+	protected $_isParsed = FALSE;
 
 	/**
 	 * Parsed representation of the data
@@ -84,8 +84,8 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_createDocuments = true,
-			$_collapseSingleValueArrays = true;
+	protected $_createDocuments = TRUE,
+			$_collapseSingleValueArrays = TRUE;
 
 	/**
 	 * Constructor. Takes the raw HTTP response body and the exploded HTTP headers
@@ -94,7 +94,7 @@ 
 	 * @param boolean $createDocuments Whether to convert the documents json_decoded as stdClass instances to Apache_Solr_Document instances
 	 * @param boolean $collapseSingleValueArrays Whether to make multivalued fields appear as single values
 	 */
-	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true)
+	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = TRUE, $collapseSingleValueArrays = TRUE)
 	{
 		$this->_response = $response;
 		$this->_createDocuments = (bool) $createDocuments;
@@ -162,7 +162,7 @@ 
 		if (!$this->_isParsed)
 		{
 			$this->_parseData();
-			$this->_isParsed = true;
+			$this->_isParsed = TRUE;
 		}
 
 		if (isset($this->_parsedData->$key))
@@ -170,7 +170,7 @@ 
 			return $this->_parsedData->$key;
 		}
 
-		return null;
+		return NULL;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 		if (!$this->_isParsed)
 		{
 			$this->_parseData();
-			$this->_isParsed = true;
+			$this->_isParsed = TRUE;
 		}
 
 		return isset($this->_parsedData->$key);
@@ -201,7 +201,7 @@ 
 		$data = json_decode($this->_response->getBody());
 
 		// check that we receive a valid JSON response - we should never receive a null
-		if ($data === null)
+		if ($data === NULL)
 		{
 			throw new Apache_Solr_ParserException('Solr response does not appear to be valid JSON, please examine the raw response with getRawResponse() method');
 		}

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

Braces +1 added lines, -2 removed lines

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

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

Spacing +39 added lines, -39 removed lines

@@ -38,14 +38,14 @@ 
 
 // See Issue #1 (http://code.google.com/p/solr-php-client/issues/detail?id=1)
 // Doesn't follow typical include path conventions, but is more convenient for users
-require_once(dirname(__FILE__) . '/Exception.php');
-require_once(dirname(__FILE__) . '/HttpTransportException.php');
-require_once(dirname(__FILE__) . '/InvalidArgumentException.php');
+require_once(dirname(__FILE__).'/Exception.php');
+require_once(dirname(__FILE__).'/HttpTransportException.php');
+require_once(dirname(__FILE__).'/InvalidArgumentException.php');
 
-require_once(dirname(__FILE__) . '/Document.php');
-require_once(dirname(__FILE__) . '/Response.php');
+require_once(dirname(__FILE__).'/Document.php');
+require_once(dirname(__FILE__).'/Response.php');
 
-require_once(dirname(__FILE__) . '/HttpTransport/Interface.php');
+require_once(dirname(__FILE__).'/HttpTransport/Interface.php');
 
 /**
  * Starting point for the Solr API. Represents a Solr server resource and has
@@ -220,7 +220,7 @@ 
 	 */
 	static public function phrase($value)
 	{
-		return '"' . self::escapePhrase($value) . '"';
+		return '"'.self::escapePhrase($value).'"';
 	}
 
 	/**
@@ -255,26 +255,26 @@ 
 	 * @param string $servlet
 	 * @return string
 	 */
-	protected function _constructUrl($servlet, $params = array())
+	protected function _constructUrl($servlet, $params = array ())
 	{
 		if (count($params))
 		{
 			//escape all parameters appropriately for inclusion in the query string
-			$escapedParams = array();
+			$escapedParams = array ();
 
 			foreach ($params as $key => $value)
 			{
-				$escapedParams[] = urlencode($key) . '=' . urlencode($value);
+				$escapedParams[] = urlencode($key).'='.urlencode($value);
 			}
 
-			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
+			$queryString = $this->_queryDelimiter.implode($this->_queryStringDelimiter, $escapedParams);
 		}
 		else
 		{
 			$queryString = '';
 		}
 
-		return 'http://' . $this->_host . ':' . $this->_port . $this->_path . $servlet . $queryString;
+		return 'http://'.$this->_host.':'.$this->_port.$this->_path.$servlet.$queryString;
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 		$this->_extractUrl = $this->_constructUrl(self::EXTRACT_SERVLET);
 		$this->_pingUrl = $this->_constructUrl(self::PING_SERVLET);
 		$this->_searchUrl = $this->_constructUrl(self::SEARCH_SERVLET);
-		$this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER ));
-		$this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER ));
+		$this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array ('wt' => self::SOLR_WRITER));
+		$this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array ('wt' => self::SOLR_WRITER));
 
 		$this->_urlsInited = true;
 	}
@@ -458,7 +458,7 @@ 
 	{
 		$path = trim($path, '/');
 
-		$this->_path = '/' . $path . '/';
+		$this->_path = '/'.$path.'/';
 
 		if ($this->_urlsInited)
 		{
@@ -476,7 +476,7 @@ 
 		// lazy load a default if one has not be set
 		if ($this->_httpTransport === false)
 		{
-			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
+			require_once(dirname(__FILE__).'/HttpTransport/FileGetContents.php');
 
 			$this->_httpTransport = new Apache_Solr_HttpTransport_FileGetContents();
 		}
@@ -744,7 +744,7 @@ 
 
 		if ($document->getBoost() !== false)
 		{
-			$xml .= ' boost="' . $document->getBoost() . '"';
+			$xml .= ' boost="'.$document->getBoost().'"';
 		}
 
 		$xml .= '>';
@@ -758,11 +758,11 @@ 
 			{
 				foreach ($value as $multivalue)
 				{
-					$xml .= '<field name="' . $key . '"';
+					$xml .= '<field name="'.$key.'"';
 
 					if ($fieldBoost !== false)
 					{
-						$xml .= ' boost="' . $fieldBoost . '"';
+						$xml .= ' boost="'.$fieldBoost.'"';
 
 						// only set the boost for the first field in the set
 						$fieldBoost = false;
@@ -770,21 +770,21 @@ 
 
 					$multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
 
-					$xml .= '>' . $multivalue . '</field>';
+					$xml .= '>'.$multivalue.'</field>';
 				}
 			}
 			else
 			{
-				$xml .= '<field name="' . $key . '"';
+				$xml .= '<field name="'.$key.'"';
 
 				if ($fieldBoost !== false)
 				{
-					$xml .= ' boost="' . $fieldBoost . '"';
+					$xml .= ' boost="'.$fieldBoost.'"';
 				}
 
 				$value = htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
 
-				$xml .= '>' . $value . '</field>';
+				$xml .= '>'.$value.'</field>';
 			}
 		}
 
@@ -824,7 +824,7 @@ 
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
 
-		$rawPost = '<commit expungeDeletes="' . $expungeValue . '" waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+		$rawPost = '<commit expungeDeletes="'.$expungeValue.'" waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />';
 
 		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
 	}
@@ -863,7 +863,7 @@ 
 		//escape special xml characters
 		$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><id>' . $id . '</id></delete>';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><id>'.$id.'</id></delete>';
 
 		return $this->delete($rawPost, $timeout);
 	}
@@ -884,14 +884,14 @@ 
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '">';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'">';
 
 		foreach ($ids as $id)
 		{
 			//escape special xml characters
 			$id = htmlspecialchars($id, ENT_NOQUOTES, 'UTF-8');
 
-			$rawPost .= '<id>' . $id . '</id>';
+			$rawPost .= '<id>'.$id.'</id>';
 		}
 
 		$rawPost .= '</delete>';
@@ -918,7 +918,7 @@ 
 		// escape special xml characters
 		$rawQuery = htmlspecialchars($rawQuery, ENT_NOQUOTES, 'UTF-8');
 
-		$rawPost = '<delete fromPending="' . $pendingValue . '" fromCommitted="' . $committedValue . '"><query>' . $rawQuery . '</query></delete>';
+		$rawPost = '<delete fromPending="'.$pendingValue.'" fromCommitted="'.$committedValue.'"><query>'.$rawQuery.'</query></delete>';
 
 		return $this->delete($rawPost, $timeout);
 	}
@@ -941,7 +941,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array (), $document = null, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -953,7 +953,7 @@ 
 		}
 		else
 		{
-			$params = array();
+			$params = array ();
 		}
 		
 		// if $file is an http request, defer to extractFromUrl instead
@@ -1002,7 +1002,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array (), $document = null, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1014,7 +1014,7 @@ 
 		}
 		else
 		{
-			$params = array();
+			$params = array ();
 		}
 
 		// make sure we receive our response in JSON and have proper name list treatment
@@ -1044,7 +1044,7 @@ 
 		$queryString = $this->_generateQueryString($params);
 
 		// the file contents will be sent to SOLR as the POST BODY - we use application/octect-stream as default mimetype
-		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, false, $mimetype);
+		return $this->_sendRawPost($this->_extractUrl.$this->_queryDelimiter.$queryString, $data, false, $mimetype);
 	}
 	
 	/**
@@ -1065,7 +1065,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
 	 */
-	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromUrl($url, $params = array (), $document = null, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1077,7 +1077,7 @@ 
 		}
 		else
 		{
-			$params = array();
+			$params = array ();
 		}
 
 		$httpTransport = $this->getHttpTransport();
@@ -1119,7 +1119,7 @@ 
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';
 
-		$rawPost = '<optimize waitFlush="' . $flushValue . '" waitSearcher="' . $searcherValue . '" />';
+		$rawPost = '<optimize waitFlush="'.$flushValue.'" waitSearcher="'.$searcherValue.'" />';
 
 		return $this->_sendRawPost($this->_updateUrl, $rawPost, $timeout);
 	}
@@ -1137,7 +1137,7 @@ 
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 * @throws Apache_Solr_InvalidArgumentException If an invalid HTTP method is used
 	 */
-	public function search($query, $offset = 0, $limit = 10, $params = array(), $method = self::METHOD_GET)
+	public function search($query, $offset = 0, $limit = 10, $params = array (), $method = self::METHOD_GET)
 	{
 		// ensure params is an array
 		if (!is_null($params))
@@ -1150,7 +1150,7 @@ 
 		}
 		else
 		{
-			$params = array();
+			$params = array ();
 		}
 		
 		// construct our full parameters
@@ -1167,7 +1167,7 @@ 
 
 		if ($method == self::METHOD_GET)
 		{
-			return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
+			return $this->_sendRawGet($this->_searchUrl.$this->_queryDelimiter.$queryString);
 		}
 		else if ($method == self::METHOD_POST)
 		{

Braces +99 added lines, -212 removed lines

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

Upper-Lower-Casing +29 added lines, -29 removed lines

@@ -134,7 +134,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_createDocuments = true;
+	protected $_createDocuments = TRUE;
 
 	/**
 	 * Whether {@link Apache_Solr_Response} objects should have multivalue fields with only a single value
@@ -142,7 +142,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_collapseSingleValueArrays = true;
+	protected $_collapseSingleValueArrays = TRUE;
 
 	/**
 	 * How NamedLists should be formatted in the output.  This specifically effects facet counts. Valid values
@@ -158,7 +158,7 @@ 
 	 *
 	 * @var string
 	 */
-	protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = true;
+	protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = TRUE;
 
 	/**
 	 * Constructed servlet full path URLs
@@ -172,14 +172,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_urlsInited = false;
+	protected $_urlsInited = FALSE;
 
 	/**
 	 * HTTP Transport implementation (pluggable)
 	 *
 	 * @var Apache_Solr_HttpTransport_Interface
 	 */
-	protected $_httpTransport = false;
+	protected $_httpTransport = FALSE;
 
 	/**
 	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
@@ -232,7 +232,7 @@ 
 	 * @param string $path
 	 * @param Apache_Solr_HttpTransport_Interface $httpTransport
 	 */
-	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false)
+	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = FALSE)
 	{
 		$this->setHost($host);
 		$this->setPort($port);
@@ -289,7 +289,7 @@ 
 		$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;
+		$this->_urlsInited = TRUE;
 	}
 
 	protected function _generateQueryString($params)
@@ -307,7 +307,7 @@ 
 		// 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);
+			$queryString = http_build_query($params, NULL, $this->_queryStringDelimiter);
 			return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
 		}
 		else
@@ -474,7 +474,7 @@ 
 	public function getHttpTransport()
 	{
 		// lazy load a default if one has not be set
-		if ($this->_httpTransport === false)
+		if ($this->_httpTransport === FALSE)
 		{
 			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
 
@@ -625,7 +625,7 @@ 
 	 */
 	public function ping($timeout = 2)
 	{
-		$start = microtime(true);
+		$start = microtime(TRUE);
 		
 		$httpTransport = $this->getHttpTransport();
 
@@ -634,11 +634,11 @@ 
 
 		if ($solrResponse->getHttpStatus() == 200)
 		{
-			return microtime(true) - $start;
+			return microtime(TRUE) - $start;
 		}
 		else
 		{
-			return false;
+			return FALSE;
 		}
 	}
 
@@ -681,7 +681,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+	public function addDocument(Apache_Solr_Document $document, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE, $commitWithin = 0)
 	{
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
@@ -709,7 +709,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+	public function addDocuments($documents, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE, $commitWithin = 0)
 	{
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
@@ -742,7 +742,7 @@ 
 	{
 		$xml = '<doc';
 
-		if ($document->getBoost() !== false)
+		if ($document->getBoost() !== FALSE)
 		{
 			$xml .= ' boost="' . $document->getBoost() . '"';
 		}
@@ -760,12 +760,12 @@ 
 				{
 					$xml .= '<field name="' . $key . '"';
 
-					if ($fieldBoost !== false)
+					if ($fieldBoost !== FALSE)
 					{
 						$xml .= ' boost="' . $fieldBoost . '"';
 
 						// only set the boost for the first field in the set
-						$fieldBoost = false;
+						$fieldBoost = FALSE;
 					}
 
 					$multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
@@ -777,7 +777,7 @@ 
 			{
 				$xml .= '<field name="' . $key . '"';
 
-				if ($fieldBoost !== false)
+				if ($fieldBoost !== FALSE)
 				{
 					$xml .= ' boost="' . $fieldBoost . '"';
 				}
@@ -818,7 +818,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function commit($expungeDeletes = FALSE, $waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$expungeValue = $expungeDeletes ? 'true' : 'false';
 		$flushValue = $waitFlush ? 'true' : 'false';
@@ -855,7 +855,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteById($id, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -879,7 +879,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByMultipleIds($ids, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -910,7 +910,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByQuery($rawQuery, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -941,7 +941,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -965,7 +965,7 @@ 
 		// read the contents of the file
 		$contents = @file_get_contents($file);
 
-		if ($contents !== false)
+		if ($contents !== FALSE)
 		{
 			// add the resource.name parameter if not specified
 			if (!isset($params['resource.name']))
@@ -1002,7 +1002,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1030,7 +1030,7 @@ 
 				// check if we need to add a boost.* parameters
 				$fieldBoost = $document->getFieldBoost($field);
 
-				if ($fieldBoost !== false)
+				if ($fieldBoost !== FALSE)
 				{
 					$params["boost.{$field}"] = $fieldBoost;
 				}
@@ -1044,7 +1044,7 @@ 
 		$queryString = $this->_generateQueryString($params);
 
 		// the file contents will be sent to SOLR as the POST BODY - we use application/octect-stream as default mimetype
-		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, false, $mimetype);
+		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, FALSE, $mimetype);
 	}
 	
 	/**
@@ -1065,7 +1065,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
 	 */
-	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromUrl($url, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1114,7 +1114,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function optimize($waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';