peter-gribanov / sphinx-php-client

src/SphinxClient.php

Doc Comments +22 added lines

@@ -246,6 +246,9 @@ 
 }
 
 // unpack 64-bit unsigned
+/**
+ * @param string $v
+ */
 function sphUnpackU64 ( $v )
 {
 	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
@@ -312,6 +315,9 @@ 
 }
 
 // unpack 64-bit signed
+/**
+ * @param string $v
+ */
 function sphUnpackI64 ( $v )
 {
 	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
@@ -396,6 +402,9 @@ 
 	}
 }
 
+/**
+ * @param integer $bit
+ */
 function sphSetBit ( $flag, $bit, $on )
 {
 	if ( $on )
@@ -566,6 +575,10 @@ 
 	}
 
 
+	/**
+	 * @param string $data
+	 * @param integer $length
+	 */
 	function _Send ( $handle, $data, $length )
 	{
 		if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
@@ -669,6 +682,10 @@ 
 	}
 
 	/// get and check response packet from searchd server
+
+	/**
+	 * @param integer $client_ver
+	 */
 	function _GetResponse ( $fp, $client_ver )
 	{
 		$response = "";
@@ -1257,6 +1274,11 @@ 
 	}
 
 	/// parse and return search query (or queries) response
+
+	/**
+	 * @param string $response
+	 * @param integer $nreqs
+	 */
 	function _ParseSearchResponse ( $response, $nreqs )
 	{
 		$p = 0; // current position

Indentation +5 added lines, -5 removed lines

@@ -588,7 +588,7 @@ 
 			$this->_mbenc = mb_internal_encoding();
 			mb_internal_encoding ( "latin1" );
 		}
-    }
+	}
 
 	/// leave mbstring workaround mode
 	function _MBPop ()
@@ -1037,9 +1037,9 @@ 
 
 	/// clear all attribute value overrides (for multi-queries)
 	function ResetOverrides ()
-    {
-    	$this->_overrides = array ();
-    }
+	{
+		$this->_overrides = array ();
+	}
 	
 	function ResetQueryFlag ()
 	{
@@ -1772,7 +1772,7 @@ 
 
 	function Status ($session=false)
 	{
-        assert ( is_bool($session) );
+		assert ( is_bool($session) );
 
 		$this->_MBPush ();
 		if (!( $fp = $this->_Connect() ))

Spacing +732 added lines, -732 removed lines

@@ -33,83 +33,83 @@ 
 /////////////////////////////////////////////////////////////////////////////
 
 /// known searchd commands
-define ( "SEARCHD_COMMAND_SEARCH",		0 );
-define ( "SEARCHD_COMMAND_EXCERPT",		1 );
-define ( "SEARCHD_COMMAND_UPDATE",		2 );
-define ( "SEARCHD_COMMAND_KEYWORDS",	3 );
-define ( "SEARCHD_COMMAND_PERSIST",		4 );
-define ( "SEARCHD_COMMAND_STATUS",		5 );
-define ( "SEARCHD_COMMAND_FLUSHATTRS",	7 );
+define("SEARCHD_COMMAND_SEARCH", 0);
+define("SEARCHD_COMMAND_EXCERPT", 1);
+define("SEARCHD_COMMAND_UPDATE", 2);
+define("SEARCHD_COMMAND_KEYWORDS", 3);
+define("SEARCHD_COMMAND_PERSIST", 4);
+define("SEARCHD_COMMAND_STATUS", 5);
+define("SEARCHD_COMMAND_FLUSHATTRS", 7);
 
 /// current client-side command implementation versions
-define ( "VER_COMMAND_SEARCH",		0x11E );
-define ( "VER_COMMAND_EXCERPT",		0x104 );
-define ( "VER_COMMAND_UPDATE",		0x103 );
-define ( "VER_COMMAND_KEYWORDS",	0x100 );
-define ( "VER_COMMAND_STATUS",		0x101 );
-define ( "VER_COMMAND_QUERY",		0x100 );
-define ( "VER_COMMAND_FLUSHATTRS",	0x100 );
+define("VER_COMMAND_SEARCH", 0x11E);
+define("VER_COMMAND_EXCERPT", 0x104);
+define("VER_COMMAND_UPDATE", 0x103);
+define("VER_COMMAND_KEYWORDS", 0x100);
+define("VER_COMMAND_STATUS", 0x101);
+define("VER_COMMAND_QUERY", 0x100);
+define("VER_COMMAND_FLUSHATTRS", 0x100);
 
 /// known searchd status codes
-define ( "SEARCHD_OK",				0 );
-define ( "SEARCHD_ERROR",			1 );
-define ( "SEARCHD_RETRY",			2 );
-define ( "SEARCHD_WARNING",			3 );
+define("SEARCHD_OK", 0);
+define("SEARCHD_ERROR", 1);
+define("SEARCHD_RETRY", 2);
+define("SEARCHD_WARNING", 3);
 
 /// known match modes
-define ( "SPH_MATCH_ALL",			0 );
-define ( "SPH_MATCH_ANY",			1 );
-define ( "SPH_MATCH_PHRASE",		2 );
-define ( "SPH_MATCH_BOOLEAN",		3 );
-define ( "SPH_MATCH_EXTENDED",		4 );
-define ( "SPH_MATCH_FULLSCAN",		5 );
-define ( "SPH_MATCH_EXTENDED2",		6 );	// extended engine V2 (TEMPORARY, WILL BE REMOVED)
+define("SPH_MATCH_ALL", 0);
+define("SPH_MATCH_ANY", 1);
+define("SPH_MATCH_PHRASE", 2);
+define("SPH_MATCH_BOOLEAN", 3);
+define("SPH_MATCH_EXTENDED", 4);
+define("SPH_MATCH_FULLSCAN", 5);
+define("SPH_MATCH_EXTENDED2", 6); // extended engine V2 (TEMPORARY, WILL BE REMOVED)
 
 /// known ranking modes (ext2 only)
-define ( "SPH_RANK_PROXIMITY_BM25",	0 );	///< default mode, phrase proximity major factor and BM25 minor one
-define ( "SPH_RANK_BM25",			1 );	///< statistical mode, BM25 ranking only (faster but worse quality)
-define ( "SPH_RANK_NONE",			2 );	///< no ranking, all matches get a weight of 1
-define ( "SPH_RANK_WORDCOUNT",		3 );	///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
-define ( "SPH_RANK_PROXIMITY",		4 );
-define ( "SPH_RANK_MATCHANY",		5 );
-define ( "SPH_RANK_FIELDMASK",		6 );
-define ( "SPH_RANK_SPH04",			7 );
-define ( "SPH_RANK_EXPR",			8 );
-define ( "SPH_RANK_TOTAL",			9 );
+define("SPH_RANK_PROXIMITY_BM25", 0); ///< default mode, phrase proximity major factor and BM25 minor one
+define("SPH_RANK_BM25", 1); ///< statistical mode, BM25 ranking only (faster but worse quality)
+define("SPH_RANK_NONE", 2); ///< no ranking, all matches get a weight of 1
+define("SPH_RANK_WORDCOUNT", 3); ///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
+define("SPH_RANK_PROXIMITY", 4);
+define("SPH_RANK_MATCHANY", 5);
+define("SPH_RANK_FIELDMASK", 6);
+define("SPH_RANK_SPH04", 7);
+define("SPH_RANK_EXPR", 8);
+define("SPH_RANK_TOTAL", 9);
 
 /// known sort modes
-define ( "SPH_SORT_RELEVANCE",		0 );
-define ( "SPH_SORT_ATTR_DESC",		1 );
-define ( "SPH_SORT_ATTR_ASC",		2 );
-define ( "SPH_SORT_TIME_SEGMENTS", 	3 );
-define ( "SPH_SORT_EXTENDED", 		4 );
-define ( "SPH_SORT_EXPR", 			5 );
+define("SPH_SORT_RELEVANCE", 0);
+define("SPH_SORT_ATTR_DESC", 1);
+define("SPH_SORT_ATTR_ASC", 2);
+define("SPH_SORT_TIME_SEGMENTS", 3);
+define("SPH_SORT_EXTENDED", 4);
+define("SPH_SORT_EXPR", 5);
 
 /// known filter types
-define ( "SPH_FILTER_VALUES",		0 );
-define ( "SPH_FILTER_RANGE",		1 );
-define ( "SPH_FILTER_FLOATRANGE",	2 );
-define ( "SPH_FILTER_STRING",	3 );
+define("SPH_FILTER_VALUES", 0);
+define("SPH_FILTER_RANGE", 1);
+define("SPH_FILTER_FLOATRANGE", 2);
+define("SPH_FILTER_STRING", 3);
 
 /// known attribute types
-define ( "SPH_ATTR_INTEGER",		1 );
-define ( "SPH_ATTR_TIMESTAMP",		2 );
-define ( "SPH_ATTR_ORDINAL",		3 );
-define ( "SPH_ATTR_BOOL",			4 );
-define ( "SPH_ATTR_FLOAT",			5 );
-define ( "SPH_ATTR_BIGINT",			6 );
-define ( "SPH_ATTR_STRING",			7 );
-define ( "SPH_ATTR_FACTORS",			1001 );
-define ( "SPH_ATTR_MULTI",			0x40000001 );
-define ( "SPH_ATTR_MULTI64",			0x40000002 );
+define("SPH_ATTR_INTEGER", 1);
+define("SPH_ATTR_TIMESTAMP", 2);
+define("SPH_ATTR_ORDINAL", 3);
+define("SPH_ATTR_BOOL", 4);
+define("SPH_ATTR_FLOAT", 5);
+define("SPH_ATTR_BIGINT", 6);
+define("SPH_ATTR_STRING", 7);
+define("SPH_ATTR_FACTORS", 1001);
+define("SPH_ATTR_MULTI", 0x40000001);
+define("SPH_ATTR_MULTI64", 0x40000002);
 
 /// known grouping functions
-define ( "SPH_GROUPBY_DAY",			0 );
-define ( "SPH_GROUPBY_WEEK",		1 );
-define ( "SPH_GROUPBY_MONTH",		2 );
-define ( "SPH_GROUPBY_YEAR",		3 );
-define ( "SPH_GROUPBY_ATTR",		4 );
-define ( "SPH_GROUPBY_ATTRPAIR",	5 );
+define("SPH_GROUPBY_DAY", 0);
+define("SPH_GROUPBY_WEEK", 1);
+define("SPH_GROUPBY_MONTH", 2);
+define("SPH_GROUPBY_YEAR", 3);
+define("SPH_GROUPBY_ATTR", 4);
+define("SPH_GROUPBY_ATTRPAIR", 5);
 
 // important properties of PHP's integers:
 //  - always signed (one bit short of PHP_INT_SIZE)
@@ -138,29 +138,29 @@ 
 //  - otherwise format number into a string
 
 /// pack 64-bit signed
-function sphPackI64 ( $v )
+function sphPackI64($v)
 {
-	assert ( is_numeric($v) );
+	assert(is_numeric($v));
 	
 	// x64
-	if ( PHP_INT_SIZE>=8 )
+	if (PHP_INT_SIZE>=8)
 	{
 		$v = (int)$v;
-		return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", $v < 0 ? -1 : 0, $v );
+	if (is_int($v))
+		return pack("NN", $v<0 ? -1 : 0, $v);
 
 	// x32, bcmath	
-	if ( function_exists("bcmul") )
+	if (function_exists("bcmul"))
 	{
-		if ( bccomp ( $v, 0 ) == -1 )
-			$v = bcadd ( "18446744073709551616", $v );
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+		if (bccomp($v, 0)==-1)
+			$v = bcadd("18446744073709551616", $v);
+		$h = bcdiv($v, "4294967296", 0);
+		$l = bcmod($v, "4294967296");
+		return pack("NN", (float)$h, (float)$l); // conversion to float is intentional; int would lose 31st bit
 	}
 
 	// x32, no-bcmath
@@ -168,14 +168,14 @@ 
 	$lo = abs((float)substr($v, $p));
 	$hi = abs((float)substr($v, 0, $p));
 
-	$m = $lo + $hi*1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
-	$q = floor($m/4294967296.0);
-	$l = $m - ($q*4294967296.0);
-	$h = $hi*2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
+	$m = $lo + $hi * 1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
+	$q = floor($m / 4294967296.0);
+	$l = $m - ($q * 4294967296.0);
+	$h = $hi * 2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
 
-	if ( $v<0 )
+	if ($v<0)
 	{
-		if ( $l==0 )
+		if ($l==0)
 			$h = 4294967296.0 - $h;
 		else
 		{
@@ -183,53 +183,53 @@ 
 			$l = 4294967296.0 - $l;
 		}
 	}
-	return pack ( "NN", $h, $l );
+	return pack("NN", $h, $l);
 }
 
 /// pack 64-bit unsigned
-function sphPackU64 ( $v )
+function sphPackU64($v)
 {
-	assert ( is_numeric($v) );
+	assert(is_numeric($v));
 	
 	// x64
-	if ( PHP_INT_SIZE>=8 )
+	if (PHP_INT_SIZE>=8)
 	{
-		assert ( $v>=0 );
+		assert($v>=0);
 		
 		// x64, int
-		if ( is_int($v) )
-			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		if (is_int($v))
+			return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
 						  
 		// x64, bcmath
-		if ( function_exists("bcmul") )
+		if (function_exists("bcmul"))
 		{
-			$h = bcdiv ( $v, 4294967296, 0 );
-			$l = bcmod ( $v, 4294967296 );
-			return pack ( "NN", $h, $l );
+			$h = bcdiv($v, 4294967296, 0);
+			$l = bcmod($v, 4294967296);
+			return pack("NN", $h, $l);
 		}
 		
 		// x64, no-bcmath
-		$p = max ( 0, strlen($v) - 13 );
-		$lo = (int)substr ( $v, $p );
-		$hi = (int)substr ( $v, 0, $p );
+		$p = max(0, strlen($v) - 13);
+		$lo = (int)substr($v, $p);
+		$hi = (int)substr($v, 0, $p);
 	
-		$m = $lo + $hi*1316134912;
+		$m = $lo + $hi * 1316134912;
 		$l = $m % 4294967296;
-		$h = $hi*2328 + (int)($m/4294967296);
+		$h = $hi * 2328 + (int)($m / 4294967296);
 
-		return pack ( "NN", $h, $l );
+		return pack("NN", $h, $l);
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", 0, $v );
+	if (is_int($v))
+		return pack("NN", 0, $v);
 	
 	// x32, bcmath
-	if ( function_exists("bcmul") )
+	if (function_exists("bcmul"))
 	{
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+		$h = bcdiv($v, "4294967296", 0);
+		$l = bcmod($v, "4294967296");
+		return pack("NN", (float)$h, (float)$l); // conversion to float is intentional; int would lose 31st bit
 	}
 
 	// x32, no-bcmath
@@ -237,112 +237,112 @@ 
 	$lo = (float)substr($v, $p);
 	$hi = (float)substr($v, 0, $p);
 	
-	$m = $lo + $hi*1316134912.0;
+	$m = $lo + $hi * 1316134912.0;
 	$q = floor($m / 4294967296.0);
 	$l = $m - ($q * 4294967296.0);
-	$h = $hi*2328.0 + $q;
+	$h = $hi * 2328.0 + $q;
 
-	return pack ( "NN", $h, $l );
+	return pack("NN", $h, $l);
 }
 
 // unpack 64-bit unsigned
-function sphUnpackU64 ( $v )
+function sphUnpackU64($v)
 {
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+	list ($hi, $lo) = array_values(unpack("N*N*", $v));
 
-	if ( PHP_INT_SIZE>=8 )
+	if (PHP_INT_SIZE>=8)
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ($hi<0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ($lo<0) $lo += (1 << 32);
 
 		// x64, int
-		if ( $hi<=2147483647 )
-			return ($hi<<32) + $lo;
+		if ($hi<=2147483647)
+			return ($hi << 32) + $lo;
 
 		// x64, bcmath
-		if ( function_exists("bcmul") )
-			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+		if (function_exists("bcmul"))
+			return bcadd($lo, bcmul($hi, "4294967296"));
 
 		// x64, no-bcmath
 		$C = 100000;
 		$h = ((int)($hi / $C) << 32) + (int)($lo / $C);
 		$l = (($hi % $C) << 32) + ($lo % $C);
-		if ( $l>$C )
+		if ($l>$C)
 		{
 			$h += (int)($l / $C);
 			$l  = $l % $C;
 		}
 
-		if ( $h==0 )
+		if ($h==0)
 			return $l;
-		return sprintf ( "%d%05d", $h, $l );
+		return sprintf("%d%05d", $h, $l);
 	}
 
 	// x32, int
-	if ( $hi==0 )
+	if ($hi==0)
 	{
-		if ( $lo>0 )
+		if ($lo>0)
 			return $lo;
-		return sprintf ( "%u", $lo );
+		return sprintf("%u", $lo);
 	}
 
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
+	$hi = sprintf("%u", $hi);
+	$lo = sprintf("%u", $lo);
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	if (function_exists("bcmul"))
+		return bcadd($lo, bcmul($hi, "4294967296"));
 	
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
 	
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return sprintf( "%.0f", (float)$l );
-	return $h . $l;
+	$q = floor($hi / 10000000.0);
+	$r = $hi - $q * 10000000.0;
+	$m = $lo + $r * 4967296.0;
+	$mq = floor($m / 10000000.0);
+	$l = $m - $mq * 10000000.0;
+	$h = $q * 4294967296.0 + $r * 429.0 + $mq;
+
+	$h = sprintf("%.0f", $h);
+	$l = sprintf("%07.0f", $l);
+	if ($h=="0")
+		return sprintf("%.0f", (float)$l);
+	return $h.$l;
 }
 
 // unpack 64-bit signed
-function sphUnpackI64 ( $v )
+function sphUnpackI64($v)
 {
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+	list ($hi, $lo) = array_values(unpack("N*N*", $v));
 
 	// x64
-	if ( PHP_INT_SIZE>=8 )
+	if (PHP_INT_SIZE>=8)
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ($hi<0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ($lo<0) $lo += (1 << 32);
 
-		return ($hi<<32) + $lo;
+		return ($hi << 32) + $lo;
 	}
 
 	// x32, int
-	if ( $hi==0 )
+	if ($hi==0)
 	{
-		if ( $lo>0 )
+		if ($lo>0)
 			return $lo;
-		return sprintf ( "%u", $lo );
+		return sprintf("%u", $lo);
 	}
 	// x32, int
-	elseif ( $hi==-1 )
+	elseif ($hi==-1)
 	{
-		if ( $lo<0 )
+		if ($lo<0)
 			return $lo;
-		return sprintf ( "%.0f", $lo - 4294967296.0 );
+		return sprintf("%.0f", $lo - 4294967296.0);
 	}
 	
 	$neg = "";
 	$c = 0;
-	if ( $hi<0 )
+	if ($hi<0)
 	{
 		$hi = ~$hi;
 		$lo = ~$lo;
@@ -350,60 +350,60 @@ 
 		$neg = "-";
 	}	
 
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
+	$hi = sprintf("%u", $hi);
+	$lo = sprintf("%u", $lo);
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+	if (function_exists("bcmul"))
+		return $neg.bcadd(bcadd($lo, bcmul($hi, "4294967296")), $c);
 
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
 	
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0 + $c;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-	if ( $l==10000000 )
+	$q = floor($hi / 10000000.0);
+	$r = $hi - $q * 10000000.0;
+	$m = $lo + $r * 4967296.0;
+	$mq = floor($m / 10000000.0);
+	$l = $m - $mq * 10000000.0 + $c;
+	$h = $q * 4294967296.0 + $r * 429.0 + $mq;
+	if ($l==10000000)
 	{
 		$l = 0;
 		$h += 1;
 	}
 
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return $neg . sprintf( "%.0f", (float)$l );
-	return $neg . $h . $l;
+	$h = sprintf("%.0f", $h);
+	$l = sprintf("%07.0f", $l);
+	if ($h=="0")
+		return $neg.sprintf("%.0f", (float)$l);
+	return $neg.$h.$l;
 }
 
 
-function sphFixUint ( $value )
+function sphFixUint($value)
 {
-	if ( PHP_INT_SIZE>=8 )
+	if (PHP_INT_SIZE>=8)
 	{
 		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
+		if ($value<0) $value += (1 << 32);
 		return $value;
 	}
 	else
 	{
 		// x32 route, workaround php signed/unsigned braindamage
-		return sprintf ( "%u", $value );
+		return sprintf("%u", $value);
 	}
 }
 
-function sphSetBit ( $flag, $bit, $on )
+function sphSetBit($flag, $bit, $on)
 {
-	if ( $on )
+	if ($on)
 	{
-		$flag |= ( 1<<$bit );
+		$flag |= (1 << $bit);
 	} else
 	{
-		$reset = 16777215 ^ ( 1<<$bit );
+		$reset = 16777215 ^ (1 << $bit);
 		$flag = $flag & $reset;
 	}
 	return $flag;
@@ -413,33 +413,33 @@ 
 /// sphinx searchd client class
 class SphinxClient
 {
-	var $_host;			///< searchd host (default is "localhost")
-	var $_port;			///< searchd port (default is 9312)
-	var $_offset;		///< how many records to seek from result-set start (default is 0)
-	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
-	var $_mode;			///< query matching mode (default is SPH_MATCH_EXTENDED2)
-	var $_weights;		///< per-field weights (default is 1 for all fields)
-	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
-	var $_sortby;		///< attribute to sort by (defualt is "")
-	var $_min_id;		///< min ID to match (default is 0, which means no limit)
-	var $_max_id;		///< max ID to match (default is 0, which means no limit)
-	var $_filters;		///< search filters
-	var $_groupby;		///< group-by attribute name
-	var $_groupfunc;	///< group-by function (to pre-process group-by attribute value with)
-	var $_groupsort;	///< group-by sorting clause (to sort groups in result set with)
-	var $_groupdistinct;///< group-by count-distinct attribute
-	var $_maxmatches;	///< max matches to retrieve
-	var $_cutoff;		///< cutoff to stop searching at (default is 0)
-	var $_retrycount;	///< distributed retries count
-	var $_retrydelay;	///< distributed retries delay
-	var $_anchor;		///< geographical anchor point
-	var $_indexweights;	///< per-index weights
-	var $_ranker;		///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
-	var $_rankexpr;		///< ranking mode expression (for SPH_RANK_EXPR)
-	var $_maxquerytime;	///< max query time, milliseconds (default is 0, do not limit)
-	var $_fieldweights;	///< per-field-name weights
-	var $_overrides;	///< per-query attribute values overrides
-	var $_select;		///< select-list (attributes or expressions, with optional aliases)
+	var $_host; ///< searchd host (default is "localhost")
+	var $_port; ///< searchd port (default is 9312)
+	var $_offset; ///< how many records to seek from result-set start (default is 0)
+	var $_limit; ///< how many records to return from result-set starting at offset (default is 20)
+	var $_mode; ///< query matching mode (default is SPH_MATCH_EXTENDED2)
+	var $_weights; ///< per-field weights (default is 1 for all fields)
+	var $_sort; ///< match sorting mode (default is SPH_SORT_RELEVANCE)
+	var $_sortby; ///< attribute to sort by (defualt is "")
+	var $_min_id; ///< min ID to match (default is 0, which means no limit)
+	var $_max_id; ///< max ID to match (default is 0, which means no limit)
+	var $_filters; ///< search filters
+	var $_groupby; ///< group-by attribute name
+	var $_groupfunc; ///< group-by function (to pre-process group-by attribute value with)
+	var $_groupsort; ///< group-by sorting clause (to sort groups in result set with)
+	var $_groupdistinct; ///< group-by count-distinct attribute
+	var $_maxmatches; ///< max matches to retrieve
+	var $_cutoff; ///< cutoff to stop searching at (default is 0)
+	var $_retrycount; ///< distributed retries count
+	var $_retrydelay; ///< distributed retries delay
+	var $_anchor; ///< geographical anchor point
+	var $_indexweights; ///< per-index weights
+	var $_ranker; ///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
+	var $_rankexpr; ///< ranking mode expression (for SPH_RANK_EXPR)
+	var $_maxquerytime; ///< max query time, milliseconds (default is 0, do not limit)
+	var $_fieldweights; ///< per-field-name weights
+	var $_overrides; ///< per-query attribute values overrides
+	var $_select; ///< select-list (attributes or expressions, with optional aliases)
 	var $_query_flags; ///< per-query various flags
 	var $_predictedtime; ///< per-query max_predicted_time
 	var $_outerorderby; ///< outer match sort by
@@ -447,21 +447,21 @@ 
 	var $_outerlimit; ///< outer limit
 	var $_hasouter;
 
-	var $_error;		///< last error message
-	var $_warning;		///< last warning message
-	var $_connerror;		///< connection error vs remote error flag
+	var $_error; ///< last error message
+	var $_warning; ///< last warning message
+	var $_connerror; ///< connection error vs remote error flag
 
-	var $_reqs;			///< requests array for multi-query
-	var $_mbenc;		///< stored mbstring encoding
-	var $_arrayresult;	///< whether $result["matches"] should be a hash or an array
-	var $_timeout;		///< connect timeout
+	var $_reqs; ///< requests array for multi-query
+	var $_mbenc; ///< stored mbstring encoding
+	var $_arrayresult; ///< whether $result["matches"] should be a hash or an array
+	var $_timeout; ///< connect timeout
 
 	/////////////////////////////////////////////////////////////////////////////
 	// common stuff
 	/////////////////////////////////////////////////////////////////////////////
 
 	/// create a new client object and fill defaults
-	function SphinxClient ()
+	function SphinxClient()
 	{
 		// per-client-object settings
 		$this->_host		= "localhost";
@@ -471,61 +471,61 @@ 
 
 		// per-query settings
 		$this->_offset		= 0;
-		$this->_limit		= 20;
+		$this->_limit = 20;
 		$this->_mode		= SPH_MATCH_EXTENDED2;
-		$this->_weights		= array ();
+		$this->_weights = array();
 		$this->_sort		= SPH_SORT_RELEVANCE;
 		$this->_sortby		= "";
 		$this->_min_id		= 0;
 		$this->_max_id		= 0;
-		$this->_filters		= array ();
+		$this->_filters		= array();
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
 		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
+		$this->_groupdistinct = "";
 		$this->_maxmatches	= 1000;
 		$this->_cutoff		= 0;
 		$this->_retrycount	= 0;
 		$this->_retrydelay	= 0;
-		$this->_anchor		= array ();
-		$this->_indexweights= array ();
+		$this->_anchor		= array();
+		$this->_indexweights = array();
 		$this->_ranker		= SPH_RANK_PROXIMITY_BM25;
-		$this->_rankexpr	= "";
-		$this->_maxquerytime= 0;
-		$this->_fieldweights= array();
-		$this->_overrides 	= array();
-		$this->_select		= "*";
-		$this->_query_flags = sphSetBit ( 0, 6, true ); // default idf=tfidf_normalized
+		$this->_rankexpr = "";
+		$this->_maxquerytime = 0;
+		$this->_fieldweights = array();
+		$this->_overrides = array();
+		$this->_select = "*";
+		$this->_query_flags = sphSetBit(0, 6, true); // default idf=tfidf_normalized
 		$this->_predictedtime = 0;
 		$this->_outerorderby = "";
 		$this->_outeroffset = 0;
 		$this->_outerlimit = 0;
 		$this->_hasouter = false;
 
-		$this->_error		= ""; // per-reply fields (for single-query case)
+		$this->_error = ""; // per-reply fields (for single-query case)
 		$this->_warning		= "";
-		$this->_connerror	= false;
+		$this->_connerror = false;
 
-		$this->_reqs		= array ();	// requests storage (for multi-query case)
-		$this->_mbenc		= "";
-		$this->_arrayresult	= false;
-		$this->_timeout		= 0;
+		$this->_reqs = array(); // requests storage (for multi-query case)
+		$this->_mbenc = "";
+		$this->_arrayresult = false;
+		$this->_timeout = 0;
 	}
 
 	function __destruct()
 	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
+		if ($this->_socket!==false)
+			fclose($this->_socket);
 	}
 
 	/// get last error message (string)
-	function GetLastError ()
+	function GetLastError()
 	{
 		return $this->_error;
 	}
 
 	/// get last warning message (string)
-	function GetLastWarning ()
+	function GetLastWarning()
 	{
 		return $this->_warning;
 	}
@@ -537,15 +537,15 @@ 
 	}
 
 	/// set searchd host name (string) and port (integer)
-	function SetServer ( $host, $port = 0 )
+	function SetServer($host, $port = 0)
 	{
-		assert ( is_string($host) );
-		if ( $host[0] == '/')
+		assert(is_string($host));
+		if ($host[0]=='/')
 		{
-			$this->_path = 'unix://' . $host;
+			$this->_path = 'unix://'.$host;
 			return;
 		}
-		if ( substr ( $host, 0, 7 )=="unix://" )
+		if (substr($host, 0, 7)=="unix://")
 		{
 			$this->_path = $host;
 			return;
@@ -553,22 +553,22 @@ 
 				
 		$this->_host = $host;
 		$port = intval($port);
-		assert ( 0<=$port && $port<65536 );
-		$this->_port = ( $port==0 ) ? 9312 : $port;
+		assert(0<=$port && $port<65536);
+		$this->_port = ($port==0) ? 9312 : $port;
 		$this->_path = '';
 	}
 
 	/// set server connection timeout (0 to remove)
-	function SetConnectTimeout ( $timeout )
+	function SetConnectTimeout($timeout)
 	{
-		assert ( is_numeric($timeout) );
+		assert(is_numeric($timeout));
 		$this->_timeout = $timeout;
 	}
 
 
-	function _Send ( $handle, $data, $length )
+	function _Send($handle, $data, $length)
 	{
-		if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
+		if (feof($handle) || fwrite($handle, $data, $length)!==$length)
 		{
 			$this->_error = 'connection unexpectedly closed (timed out?)';
 			$this->_connerror = true;
@@ -580,31 +580,31 @@ 
 	/////////////////////////////////////////////////////////////////////////////
 
 	/// enter mbstring workaround mode
-	function _MBPush ()
+	function _MBPush()
 	{
 		$this->_mbenc = "";
-		if ( ini_get ( "mbstring.func_overload" ) & 2 )
+		if (ini_get("mbstring.func_overload") & 2)
 		{
 			$this->_mbenc = mb_internal_encoding();
-			mb_internal_encoding ( "latin1" );
+			mb_internal_encoding("latin1");
 		}
     }
 
 	/// leave mbstring workaround mode
-	function _MBPop ()
+	function _MBPop()
 	{
-		if ( $this->_mbenc )
-			mb_internal_encoding ( $this->_mbenc );
+		if ($this->_mbenc)
+			mb_internal_encoding($this->_mbenc);
 	}
 
 	/// connect to searchd server
-	function _Connect ()
+	function _Connect()
 	{
-		if ( $this->_socket!==false )
+		if ($this->_socket!==false)
 		{
 			// we are in persistent connection mode, so we have a socket
 			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
+			if (!@feof($this->_socket))
 				return $this->_socket;
 
 			// force reopen
@@ -615,7 +615,7 @@ 
 		$errstr = "";
 		$this->_connerror = false;
 
-		if ( $this->_path )
+		if ($this->_path)
 		{
 			$host = $this->_path;
 			$port = 0;
@@ -626,19 +626,19 @@ 
 			$port = $this->_port;
 		}
 
-		if ( $this->_timeout<=0 )
-			$fp = @fsockopen ( $host, $port, $errno, $errstr );
+		if ($this->_timeout<=0)
+			$fp = @fsockopen($host, $port, $errno, $errstr);
 		else
-			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+			$fp = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
 		
-		if ( !$fp )
+		if (!$fp)
 		{
-			if ( $this->_path )
+			if ($this->_path)
 				$location = $this->_path;
 			else
 				$location = "{$this->_host}:{$this->_port}";
 			
-			$errstr = trim ( $errstr );
+			$errstr = trim($errstr);
 			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
 			$this->_connerror = true;
 			return false;
@@ -648,19 +648,19 @@ 
 		// this is a subtle part. we must do it before (!) reading back from searchd.
 		// because otherwise under some conditions (reported on FreeBSD for instance)
 		// TCP stack could throttle write-write-read pattern because of Nagle.
-		if ( !$this->_Send ( $fp, pack ( "N", 1 ), 4 ) )
+		if (!$this->_Send($fp, pack("N", 1), 4))
 		{
-			fclose ( $fp );
+			fclose($fp);
 			$this->_error = "failed to send client protocol version";
 			return false;
 		}
 
 		// check version
-		list(,$v) = unpack ( "N*", fread ( $fp, 4 ) );
+		list(,$v) = unpack("N*", fread($fp, 4));
 		$v = (int)$v;
-		if ( $v<1 )
+		if ($v<1)
 		{
-			fclose ( $fp );
+			fclose($fp);
 			$this->_error = "expected searchd protocol version 1+, got version '$v'";
 			return false;
 		}
@@ -669,32 +669,32 @@ 
 	}
 
 	/// get and check response packet from searchd server
-	function _GetResponse ( $fp, $client_ver )
+	function _GetResponse($fp, $client_ver)
 	{
 		$response = "";
 		$len = 0;
 
-		$header = fread ( $fp, 8 );
-		if ( strlen($header)==8 )
+		$header = fread($fp, 8);
+		if (strlen($header)==8)
 		{
-			list ( $status, $ver, $len ) = array_values ( unpack ( "n2a/Nb", $header ) );
+			list ($status, $ver, $len) = array_values(unpack("n2a/Nb", $header));
 			$left = $len;
-			while ( $left>0 && !feof($fp) )
+			while ($left>0 && !feof($fp))
 			{
-				$chunk = fread ( $fp, min ( 8192, $left ) );
-				if ( $chunk )
+				$chunk = fread($fp, min(8192, $left));
+				if ($chunk)
 				{
 					$response .= $chunk;
 					$left -= strlen($chunk);
 				}
 			}
 		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
+		if ($this->_socket===false)
+			fclose($fp);
 
 		// check response
-		$read = strlen ( $response );
-		if ( !$response || $read!=$len )
+		$read = strlen($response);
+		if (!$response || $read!=$len)
 		{
 			$this->_error = $len
 				? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
@@ -703,33 +703,33 @@ 
 		}
 
 		// check status
-		if ( $status==SEARCHD_WARNING )
+		if ($status==SEARCHD_WARNING)
 		{
-			list(,$wlen) = unpack ( "N*", substr ( $response, 0, 4 ) );
-			$this->_warning = substr ( $response, 4, $wlen );
-			return substr ( $response, 4+$wlen );
+			list(,$wlen) = unpack("N*", substr($response, 0, 4));
+			$this->_warning = substr($response, 4, $wlen);
+			return substr($response, 4 + $wlen);
 		}
-		if ( $status==SEARCHD_ERROR )
+		if ($status==SEARCHD_ERROR)
 		{
-			$this->_error = "searchd error: " . substr ( $response, 4 );
+			$this->_error = "searchd error: ".substr($response, 4);
 			return false;
 		}
-		if ( $status==SEARCHD_RETRY )
+		if ($status==SEARCHD_RETRY)
 		{
-			$this->_error = "temporary searchd error: " . substr ( $response, 4 );
+			$this->_error = "temporary searchd error: ".substr($response, 4);
 			return false;
 		}
-		if ( $status!=SEARCHD_OK )
+		if ($status!=SEARCHD_OK)
 		{
 			$this->_error = "unknown status code '$status'";
 			return false;
 		}
 
 		// check version
-		if ( $ver<$client_ver )
+		if ($ver<$client_ver)
 		{
-			$this->_warning = sprintf ( "searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
-				$ver>>8, $ver&0xff, $client_ver>>8, $client_ver&0xff );
+			$this->_warning = sprintf("searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
+				$ver >> 8, $ver & 0xff, $client_ver >> 8, $client_ver & 0xff);
 		}
 
 		return $response;
@@ -741,65 +741,65 @@ 
 
 	/// set offset and count into result set,
 	/// and optionally set max-matches and cutoff limits
-	function SetLimits ( $offset, $limit, $max=0, $cutoff=0 )
+	function SetLimits($offset, $limit, $max = 0, $cutoff = 0)
 	{
-		assert ( is_int($offset) );
-		assert ( is_int($limit) );
-		assert ( $offset>=0 );
-		assert ( $limit>0 );
-		assert ( $max>=0 );
+		assert(is_int($offset));
+		assert(is_int($limit));
+		assert($offset>=0);
+		assert($limit>0);
+		assert($max>=0);
 		$this->_offset = $offset;
 		$this->_limit = $limit;
-		if ( $max>0 )
+		if ($max>0)
 			$this->_maxmatches = $max;
-		if ( $cutoff>0 )
+		if ($cutoff>0)
 			$this->_cutoff = $cutoff;
 	}
 
 	/// set maximum query time, in milliseconds, per-index
 	/// integer, 0 means "do not limit"
-	function SetMaxQueryTime ( $max )
+	function SetMaxQueryTime($max)
 	{
-		assert ( is_int($max) );
-		assert ( $max>=0 );
+		assert(is_int($max));
+		assert($max>=0);
 		$this->_maxquerytime = $max;
 	}
 
 	/// set matching mode
-	function SetMatchMode ( $mode )
+	function SetMatchMode($mode)
 	{
-		trigger_error ( 'DEPRECATED: Do not call this method or, even better, use SphinxQL instead of an API', E_USER_DEPRECATED );
-		assert ( $mode==SPH_MATCH_ALL
+		trigger_error('DEPRECATED: Do not call this method or, even better, use SphinxQL instead of an API', E_USER_DEPRECATED);
+		assert($mode==SPH_MATCH_ALL
 			|| $mode==SPH_MATCH_ANY
 			|| $mode==SPH_MATCH_PHRASE
 			|| $mode==SPH_MATCH_BOOLEAN
 			|| $mode==SPH_MATCH_EXTENDED
 			|| $mode==SPH_MATCH_FULLSCAN
-			|| $mode==SPH_MATCH_EXTENDED2 );
+			|| $mode==SPH_MATCH_EXTENDED2);
 		$this->_mode = $mode;
 	}
 
 	/// set ranking mode
-	function SetRankingMode ( $ranker, $rankexpr="" )
+	function SetRankingMode($ranker, $rankexpr = "")
 	{
-		assert ( $ranker===0 || $ranker>=1 && $ranker<SPH_RANK_TOTAL );
-		assert ( is_string($rankexpr) );
+		assert($ranker===0 || $ranker>=1 && $ranker<SPH_RANK_TOTAL);
+		assert(is_string($rankexpr));
 		$this->_ranker = $ranker;
 		$this->_rankexpr = $rankexpr;
 	}
 
 	/// set matches sorting mode
-	function SetSortMode ( $mode, $sortby="" )
+	function SetSortMode($mode, $sortby = "")
 	{
-		assert (
+		assert(
 			$mode==SPH_SORT_RELEVANCE ||
 			$mode==SPH_SORT_ATTR_DESC ||
 			$mode==SPH_SORT_ATTR_ASC ||
 			$mode==SPH_SORT_TIME_SEGMENTS ||
 			$mode==SPH_SORT_EXTENDED ||
 			$mode==SPH_SORT_EXPR );
-		assert ( is_string($sortby) );
-		assert ( $mode==SPH_SORT_RELEVANCE || strlen($sortby)>0 );
+		assert(is_string($sortby));
+		assert($mode==SPH_SORT_RELEVANCE || strlen($sortby)>0);
 
 		$this->_sort = $mode;
 		$this->_sortby = $sortby;
@@ -807,120 +807,120 @@ 
 
 	/// bind per-field weights by order
 	/// DEPRECATED; use SetFieldWeights() instead
-	function SetWeights ( $weights )
+	function SetWeights($weights)
 	{
 		die("This method is now deprecated; please use SetFieldWeights instead");
 	}
 
 	/// bind per-field weights by name
-	function SetFieldWeights ( $weights )
+	function SetFieldWeights($weights)
 	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $name=>$weight )
+		assert(is_array($weights));
+		foreach ($weights as $name=>$weight)
 		{
-			assert ( is_string($name) );
-			assert ( is_int($weight) );
+			assert(is_string($name));
+			assert(is_int($weight));
 		}
 		$this->_fieldweights = $weights;
 	}
 
 	/// bind per-index weights by name
-	function SetIndexWeights ( $weights )
+	function SetIndexWeights($weights)
 	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $index=>$weight )
+		assert(is_array($weights));
+		foreach ($weights as $index=>$weight)
 		{
-			assert ( is_string($index) );
-			assert ( is_int($weight) );
+			assert(is_string($index));
+			assert(is_int($weight));
 		}
 		$this->_indexweights = $weights;
 	}
 
 	/// set IDs range to match
 	/// only match records if document ID is beetwen $min and $max (inclusive)
-	function SetIDRange ( $min, $max )
+	function SetIDRange($min, $max)
 	{
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
+		assert(is_numeric($min));
+		assert(is_numeric($max));
+		assert($min<=$max);
 		$this->_min_id = $min;
 		$this->_max_id = $max;
 	}
 
 	/// set values set filter
 	/// only match records where $attribute value is in given set
-	function SetFilter ( $attribute, $values, $exclude=false )
+	function SetFilter($attribute, $values, $exclude = false)
 	{
-		assert ( is_string($attribute) );
-		assert ( is_array($values) );
-		assert ( count($values) );
+		assert(is_string($attribute));
+		assert(is_array($values));
+		assert(count($values));
 
-		if ( is_array($values) && count($values) )
+		if (is_array($values) && count($values))
 		{
-			foreach ( $values as $value )
-				assert ( is_numeric($value) );
+			foreach ($values as $value)
+				assert(is_numeric($value));
 
-			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
+			$this->_filters[] = array("type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values);
 		}
 	}
 	
 	/// set string filter
 	/// only match records where $attribute value is equal
-	function SetFilterString ( $attribute, $value, $exclude=false )
+	function SetFilterString($attribute, $value, $exclude = false)
 	{
-		assert ( is_string($attribute) );
-		assert ( is_string($value) );
-		$this->_filters[] = array ( "type"=>SPH_FILTER_STRING, "attr"=>$attribute, "exclude"=>$exclude, "value"=>$value );
+		assert(is_string($attribute));
+		assert(is_string($value));
+		$this->_filters[] = array("type"=>SPH_FILTER_STRING, "attr"=>$attribute, "exclude"=>$exclude, "value"=>$value);
 	}	
 
 	/// set range filter
 	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	function SetFilterRange ( $attribute, $min, $max, $exclude=false )
+	function SetFilterRange($attribute, $min, $max, $exclude = false)
 	{
-		assert ( is_string($attribute) );
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
+		assert(is_string($attribute));
+		assert(is_numeric($min));
+		assert(is_numeric($max));
+		assert($min<=$max);
 
-		$this->_filters[] = array ( "type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+		$this->_filters[] = array("type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max);
 	}
 
 	/// set float range filter
 	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false )
+	function SetFilterFloatRange($attribute, $min, $max, $exclude = false)
 	{
-		assert ( is_string($attribute) );
-		assert ( is_float($min) );
-		assert ( is_float($max) );
-		assert ( $min<=$max );
+		assert(is_string($attribute));
+		assert(is_float($min));
+		assert(is_float($max));
+		assert($min<=$max);
 
-		$this->_filters[] = array ( "type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+		$this->_filters[] = array("type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max);
 	}
 
 	/// setup anchor point for geosphere distance calculations
 	/// required to use @geodist in filters and sorting
 	/// latitude and longitude must be in radians
-	function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long )
+	function SetGeoAnchor($attrlat, $attrlong, $lat, $long)
 	{
-		assert ( is_string($attrlat) );
-		assert ( is_string($attrlong) );
-		assert ( is_float($lat) );
-		assert ( is_float($long) );
+		assert(is_string($attrlat));
+		assert(is_string($attrlong));
+		assert(is_float($lat));
+		assert(is_float($long));
 
-		$this->_anchor = array ( "attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long );
+		$this->_anchor = array("attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long);
 	}
 
 	/// set grouping attribute and function
-	function SetGroupBy ( $attribute, $func, $groupsort="@group desc" )
+	function SetGroupBy($attribute, $func, $groupsort = "@group desc")
 	{
-		assert ( is_string($attribute) );
-		assert ( is_string($groupsort) );
-		assert ( $func==SPH_GROUPBY_DAY
+		assert(is_string($attribute));
+		assert(is_string($groupsort));
+		assert($func==SPH_GROUPBY_DAY
 			|| $func==SPH_GROUPBY_WEEK
 			|| $func==SPH_GROUPBY_MONTH
 			|| $func==SPH_GROUPBY_YEAR
 			|| $func==SPH_GROUPBY_ATTR
-			|| $func==SPH_GROUPBY_ATTRPAIR );
+			|| $func==SPH_GROUPBY_ATTRPAIR);
 
 		$this->_groupby = $attribute;
 		$this->_groupfunc = $func;
@@ -928,87 +928,87 @@ 
 	}
 
 	/// set count-distinct attribute for group-by queries
-	function SetGroupDistinct ( $attribute )
+	function SetGroupDistinct($attribute)
 	{
-		assert ( is_string($attribute) );
+		assert(is_string($attribute));
 		$this->_groupdistinct = $attribute;
 	}
 
 	/// set distributed retries count and delay
-	function SetRetries ( $count, $delay=0 )
+	function SetRetries($count, $delay = 0)
 	{
-		assert ( is_int($count) && $count>=0 );
-		assert ( is_int($delay) && $delay>=0 );
+		assert(is_int($count) && $count>=0);
+		assert(is_int($delay) && $delay>=0);
 		$this->_retrycount = $count;
 		$this->_retrydelay = $delay;
 	}
 
 	/// set result set format (hash or array; hash by default)
 	/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
-	function SetArrayResult ( $arrayresult )
+	function SetArrayResult($arrayresult)
 	{
-		assert ( is_bool($arrayresult) );
+		assert(is_bool($arrayresult));
 		$this->_arrayresult = $arrayresult;
 	}
 
 	/// set attribute values override
 	/// there can be only one override per attribute
 	/// $values must be a hash that maps document IDs to attribute values
-	function SetOverride ( $attrname, $attrtype, $values )
+	function SetOverride($attrname, $attrtype, $values)
 	{
 		trigger_error('DEPRECATED: Do not call this method. Use SphinxQL REMAP() function instead.', E_USER_DEPRECATED);
-		assert ( is_string ( $attrname ) );
-		assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
-		assert ( is_array ( $values ) );
+		assert(is_string($attrname));
+		assert(in_array($attrtype, array(SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT)));
+		assert(is_array($values));
 
-		$this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
+		$this->_overrides[$attrname] = array("attr"=>$attrname, "type"=>$attrtype, "values"=>$values);
 	}
 
 	/// set select-list (attributes or expressions), SQL-like syntax
-	function SetSelect ( $select )
+	function SetSelect($select)
 	{
-		assert ( is_string ( $select ) );
+		assert(is_string($select));
 		$this->_select = $select;
 	}
 	
-	function SetQueryFlag ( $flag_name, $flag_value )
-	{
-		$known_names = array ( "reverse_scan", "sort_method", "max_predicted_time", "boolean_simplify", "idf", "global_idf", "low_priority" );
-		$flags = array (
-		"reverse_scan" => array ( 0, 1 ),
-		"sort_method" => array ( "pq", "kbuffer" ),
-		"max_predicted_time" => array ( 0 ),
-		"boolean_simplify" => array ( true, false ),
-		"idf" => array ("normalized", "plain", "tfidf_normalized", "tfidf_unnormalized" ),
-		"global_idf" => array ( true, false ),
-		"low_priority" => array ( true, false )
+	function SetQueryFlag($flag_name, $flag_value)
+	{
+		$known_names = array("reverse_scan", "sort_method", "max_predicted_time", "boolean_simplify", "idf", "global_idf", "low_priority");
+		$flags = array(
+		"reverse_scan" => array(0, 1),
+		"sort_method" => array("pq", "kbuffer"),
+		"max_predicted_time" => array(0),
+		"boolean_simplify" => array(true, false),
+		"idf" => array("normalized", "plain", "tfidf_normalized", "tfidf_unnormalized"),
+		"global_idf" => array(true, false),
+		"low_priority" => array(true, false)
 		);
 		
-		assert ( isset ( $flag_name, $known_names ) );
-		assert ( in_array( $flag_value, $flags[$flag_name], true ) || ( $flag_name=="max_predicted_time" && is_int ( $flag_value ) && $flag_value>=0 ) );
+		assert(isset ($flag_name, $known_names));
+		assert(in_array($flag_value, $flags[$flag_name], true) || ($flag_name=="max_predicted_time" && is_int($flag_value) && $flag_value>=0));
 		
-		if ( $flag_name=="reverse_scan" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 0, $flag_value==1 );
-		if ( $flag_name=="sort_method" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 1, $flag_value=="kbuffer" );
-		if ( $flag_name=="max_predicted_time" )
+		if ($flag_name=="reverse_scan")	$this->_query_flags = sphSetBit($this->_query_flags, 0, $flag_value==1);
+		if ($flag_name=="sort_method")	$this->_query_flags = sphSetBit($this->_query_flags, 1, $flag_value=="kbuffer");
+		if ($flag_name=="max_predicted_time")
 		{
-			$this->_query_flags = sphSetBit ( $this->_query_flags, 2, $flag_value>0 );
+			$this->_query_flags = sphSetBit($this->_query_flags, 2, $flag_value>0);
 			$this->_predictedtime = (int)$flag_value;
 		}
-		if ( $flag_name=="boolean_simplify" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 3, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="normalized" || $flag_value=="plain" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 4, $flag_value=="plain" );
-		if ( $flag_name=="global_idf" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 5, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 6, $flag_value=="tfidf_normalized" );
-		if ( $flag_name=="low_priority" ) $this->_query_flags = sphSetBit ( $this->_query_flags, 8, $flag_value );
+		if ($flag_name=="boolean_simplify")	$this->_query_flags = sphSetBit($this->_query_flags, 3, $flag_value);
+		if ($flag_name=="idf" && ($flag_value=="normalized" || $flag_value=="plain"))	$this->_query_flags = sphSetBit($this->_query_flags, 4, $flag_value=="plain");
+		if ($flag_name=="global_idf")	$this->_query_flags = sphSetBit($this->_query_flags, 5, $flag_value);
+		if ($flag_name=="idf" && ($flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized"))	$this->_query_flags = sphSetBit($this->_query_flags, 6, $flag_value=="tfidf_normalized");
+		if ($flag_name=="low_priority") $this->_query_flags = sphSetBit($this->_query_flags, 8, $flag_value);
 	}
 	
 	/// set outer order by parameters
-	function SetOuterSelect ( $orderby, $offset, $limit )
+	function SetOuterSelect($orderby, $offset, $limit)
 	{
-		assert ( is_string($orderby) );
-		assert ( is_int($offset) );
-		assert ( is_int($limit) );
-		assert ( $offset>=0 );
-		assert ( $limit>0 );
+		assert(is_string($orderby));
+		assert(is_int($offset));
+		assert(is_int($limit));
+		assert($offset>=0);
+		assert($limit>0);
 
 		$this->_outerorderby = $orderby;
 		$this->_outeroffset = $offset;
@@ -1020,34 +1020,34 @@ 
 	//////////////////////////////////////////////////////////////////////////////
 
 	/// clear all filters (for multi-queries)
-	function ResetFilters ()
+	function ResetFilters()
 	{
 		$this->_filters = array();
 		$this->_anchor = array();
 	}
 
 	/// clear groupby settings (for multi-queries)
-	function ResetGroupBy ()
+	function ResetGroupBy()
 	{
-		$this->_groupby		= "";
+		$this->_groupby = "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
 		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
+		$this->_groupdistinct = "";
 	}
 
 	/// clear all attribute value overrides (for multi-queries)
-	function ResetOverrides ()
+	function ResetOverrides()
     {
-    	$this->_overrides = array ();
+    	$this->_overrides = array();
     }
 	
-	function ResetQueryFlag ()
+	function ResetQueryFlag()
 	{
-		$this->_query_flags = sphSetBit ( 0, 6, true ); // default idf=tfidf_normalized
+		$this->_query_flags = sphSetBit(0, 6, true); // default idf=tfidf_normalized
 		$this->_predictedtime = 0;
 	}
 
-	function ResetOuterSelect ()
+	function ResetOuterSelect()
 	{
 		$this->_outerorderby = '';
 		$this->_outeroffset = 0;
@@ -1059,227 +1059,227 @@ 
 
 	/// connect to searchd server, run given search query through given indexes,
 	/// and return the search results
-	function Query ( $query, $index="*", $comment="" )
+	function Query($query, $index = "*", $comment = "")
 	{
-		assert ( empty($this->_reqs) );
+		assert(empty($this->_reqs));
 
-		$this->AddQuery ( $query, $index, $comment );
-		$results = $this->RunQueries ();
-		$this->_reqs = array (); // just in case it failed too early
+		$this->AddQuery($query, $index, $comment);
+		$results = $this->RunQueries();
+		$this->_reqs = array(); // just in case it failed too early
 
-		if ( !is_array($results) )
+		if (!is_array($results))
 			return false; // probably network error; error message should be already filled
 
 		$this->_error = $results[0]["error"];
 		$this->_warning = $results[0]["warning"];
-		if ( $results[0]["status"]==SEARCHD_ERROR )
+		if ($results[0]["status"]==SEARCHD_ERROR)
 			return false;
 		else
 			return $results[0];
 	}
 
 	/// helper to pack floats in network byte order
-	function _PackFloat ( $f )
+	function _PackFloat($f)
 	{
-		$t1 = pack ( "f", $f ); // machine order
-		list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
-		return pack ( "N", $t2 );
+		$t1 = pack("f", $f); // machine order
+		list(,$t2) = unpack("L*", $t1); // int in machine order
+		return pack("N", $t2);
 	}
 
 	/// add query to multi-query batch
 	/// returns index into results array from RunQueries() call
-	function AddQuery ( $query, $index="*", $comment="" )
+	function AddQuery($query, $index = "*", $comment = "")
 	{
 		// mbstring workaround
-		$this->_MBPush ();
+		$this->_MBPush();
 
 		// build request
-		$req = pack ( "NNNNN", $this->_query_flags, $this->_offset, $this->_limit, $this->_mode, $this->_ranker );
-		if ( $this->_ranker==SPH_RANK_EXPR )
-			$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
-		$req .= pack ( "N", $this->_sort ); // (deprecated) sort mode
-		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
-		$req .= pack ( "N", strlen($query) ) . $query; // query itself
-		$req .= pack ( "N", count($this->_weights) ); // weights
-		foreach ( $this->_weights as $weight )
-			$req .= pack ( "N", (int)$weight );
-		$req .= pack ( "N", strlen($index) ) . $index; // indexes
-		$req .= pack ( "N", 1 ); // id64 range marker
-		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
+		$req = pack("NNNNN", $this->_query_flags, $this->_offset, $this->_limit, $this->_mode, $this->_ranker);
+		if ($this->_ranker==SPH_RANK_EXPR)
+			$req .= pack("N", strlen($this->_rankexpr)).$this->_rankexpr;
+		$req .= pack("N", $this->_sort); // (deprecated) sort mode
+		$req .= pack("N", strlen($this->_sortby)).$this->_sortby;
+		$req .= pack("N", strlen($query)).$query; // query itself
+		$req .= pack("N", count($this->_weights)); // weights
+		foreach ($this->_weights as $weight)
+			$req .= pack("N", (int)$weight);
+		$req .= pack("N", strlen($index)).$index; // indexes
+		$req .= pack("N", 1); // id64 range marker
+		$req .= sphPackU64($this->_min_id).sphPackU64($this->_max_id); // id64 range
 
 		// filters
-		$req .= pack ( "N", count($this->_filters) );
-		foreach ( $this->_filters as $filter )
+		$req .= pack("N", count($this->_filters));
+		foreach ($this->_filters as $filter)
 		{
-			$req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
-			$req .= pack ( "N", $filter["type"] );
-			switch ( $filter["type"] )
+			$req .= pack("N", strlen($filter["attr"])).$filter["attr"];
+			$req .= pack("N", $filter["type"]);
+			switch ($filter["type"])
 			{
 				case SPH_FILTER_VALUES:
-					$req .= pack ( "N", count($filter["values"]) );
-					foreach ( $filter["values"] as $value )
-						$req .= sphPackI64 ( $value );
+					$req .= pack("N", count($filter["values"]));
+					foreach ($filter["values"] as $value)
+						$req .= sphPackI64($value);
 					break;
 
 				case SPH_FILTER_RANGE:
-					$req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] );
+					$req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
 					break;
 
 				case SPH_FILTER_FLOATRANGE:
-					$req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] );
+					$req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
 					break;
 					
 				case SPH_FILTER_STRING:
-					$req .= pack ( "N", strlen($filter["value"]) ) . $filter["value"];
+					$req .= pack("N", strlen($filter["value"])).$filter["value"];
 					break;
 
 				default:
-					assert ( 0 && "internal error: unhandled filter type" );
+					assert(0 && "internal error: unhandled filter type");
 			}
-			$req .= pack ( "N", $filter["exclude"] );
+			$req .= pack("N", $filter["exclude"]);
 		}
 
 		// group-by clause, max-matches count, group-sort clause, cutoff count
-		$req .= pack ( "NN", $this->_groupfunc, strlen($this->_groupby) ) . $this->_groupby;
-		$req .= pack ( "N", $this->_maxmatches );
-		$req .= pack ( "N", strlen($this->_groupsort) ) . $this->_groupsort;
-		$req .= pack ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
-		$req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
+		$req .= pack("NN", $this->_groupfunc, strlen($this->_groupby)).$this->_groupby;
+		$req .= pack("N", $this->_maxmatches);
+		$req .= pack("N", strlen($this->_groupsort)).$this->_groupsort;
+		$req .= pack("NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay);
+		$req .= pack("N", strlen($this->_groupdistinct)).$this->_groupdistinct;
 
 		// anchor point
-		if ( empty($this->_anchor) )
+		if (empty($this->_anchor))
 		{
-			$req .= pack ( "N", 0 );
+			$req .= pack("N", 0);
 		} else
 		{
-			$a =& $this->_anchor;
-			$req .= pack ( "N", 1 );
-			$req .= pack ( "N", strlen($a["attrlat"]) ) . $a["attrlat"];
-			$req .= pack ( "N", strlen($a["attrlong"]) ) . $a["attrlong"];
-			$req .= $this->_PackFloat ( $a["lat"] ) . $this->_PackFloat ( $a["long"] );
+			$a = & $this->_anchor;
+			$req .= pack("N", 1);
+			$req .= pack("N", strlen($a["attrlat"])).$a["attrlat"];
+			$req .= pack("N", strlen($a["attrlong"])).$a["attrlong"];
+			$req .= $this->_PackFloat($a["lat"]).$this->_PackFloat($a["long"]);
 		}
 
 		// per-index weights
-		$req .= pack ( "N", count($this->_indexweights) );
-		foreach ( $this->_indexweights as $idx=>$weight )
-			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+		$req .= pack("N", count($this->_indexweights));
+		foreach ($this->_indexweights as $idx=>$weight)
+			$req .= pack("N", strlen($idx)).$idx.pack("N", $weight);
 
 		// max query time
-		$req .= pack ( "N", $this->_maxquerytime );
+		$req .= pack("N", $this->_maxquerytime);
 
 		// per-field weights
-		$req .= pack ( "N", count($this->_fieldweights) );
-		foreach ( $this->_fieldweights as $field=>$weight )
-			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+		$req .= pack("N", count($this->_fieldweights));
+		foreach ($this->_fieldweights as $field=>$weight)
+			$req .= pack("N", strlen($field)).$field.pack("N", $weight);
 
 		// comment
-		$req .= pack ( "N", strlen($comment) ) . $comment;
+		$req .= pack("N", strlen($comment)).$comment;
 
 		// attribute overrides
-		$req .= pack ( "N", count($this->_overrides) );
-		foreach ( $this->_overrides as $key => $entry )
+		$req .= pack("N", count($this->_overrides));
+		foreach ($this->_overrides as $key => $entry)
 		{
-			$req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
-			$req .= pack ( "NN", $entry["type"], count($entry["values"]) );
-			foreach ( $entry["values"] as $id=>$val )
+			$req .= pack("N", strlen($entry["attr"])).$entry["attr"];
+			$req .= pack("NN", $entry["type"], count($entry["values"]));
+			foreach ($entry["values"] as $id=>$val)
 			{
-				assert ( is_numeric($id) );
-				assert ( is_numeric($val) );
+				assert(is_numeric($id));
+				assert(is_numeric($val));
 
-				$req .= sphPackU64 ( $id );
-				switch ( $entry["type"] )
+				$req .= sphPackU64($id);
+				switch ($entry["type"])
 				{
-					case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat ( $val ); break;
-					case SPH_ATTR_BIGINT:	$req .= sphPackI64 ( $val ); break;
-					default:				$req .= pack ( "N", $val ); break;
+					case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat($val); break;
+					case SPH_ATTR_BIGINT:	$req .= sphPackI64($val); break;
+					default:				$req .= pack("N", $val); break;
 				}
 			}
 		}
 
 		// select-list
-		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
+		$req .= pack("N", strlen($this->_select)).$this->_select;
 		
 		// max_predicted_time
-		if ( $this->_predictedtime>0 )
-			$req .= pack ( "N", (int)$this->_predictedtime );
+		if ($this->_predictedtime>0)
+			$req .= pack("N", (int)$this->_predictedtime);
 			
-		$req .= pack ( "N", strlen($this->_outerorderby) ) . $this->_outerorderby;
-		$req .= pack ( "NN", $this->_outeroffset, $this->_outerlimit );
-		if ( $this->_hasouter )
-			$req .= pack ( "N", 1 );
+		$req .= pack("N", strlen($this->_outerorderby)).$this->_outerorderby;
+		$req .= pack("NN", $this->_outeroffset, $this->_outerlimit);
+		if ($this->_hasouter)
+			$req .= pack("N", 1);
 		else
-			$req .= pack ( "N", 0 );
+			$req .= pack("N", 0);
 
 		// mbstring workaround
-		$this->_MBPop ();
+		$this->_MBPop();
 
 		// store request to requests array
 		$this->_reqs[] = $req;
-		return count($this->_reqs)-1;
+		return count($this->_reqs) - 1;
 	}
 
 	/// connect to searchd, run queries batch, and return an array of result sets
-	function RunQueries ()
+	function RunQueries()
 	{
-		if ( empty($this->_reqs) )
+		if (empty($this->_reqs))
 		{
 			$this->_error = "no queries defined, issue AddQuery() first";
 			return false;
 		}
 
 		// mbstring workaround
-		$this->_MBPush ();
+		$this->_MBPush();
 
-		if (!( $fp = $this->_Connect() ))
+		if (!($fp = $this->_Connect()))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return false;
 		}
 
 		// send query, get response
 		$nreqs = count($this->_reqs);
-		$req = join ( "", $this->_reqs );
-		$len = 8+strlen($req);
-		$req = pack ( "nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs ) . $req; // add header
+		$req = join("", $this->_reqs);
+		$len = 8 + strlen($req);
+		$req = pack("nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs).$req; // add header
 
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_SEARCH ) ) )
+		if (!($this->_Send($fp, $req, $len + 8)) ||
+			 !($response = $this->_GetResponse($fp, VER_COMMAND_SEARCH)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return false;
 		}
 
 		// query sent ok; we can reset reqs now
-		$this->_reqs = array ();
+		$this->_reqs = array();
 
 		// parse and return response
-		return $this->_ParseSearchResponse ( $response, $nreqs );
+		return $this->_ParseSearchResponse($response, $nreqs);
 	}
 
 	/// parse and return search query (or queries) response
-	function _ParseSearchResponse ( $response, $nreqs )
+	function _ParseSearchResponse($response, $nreqs)
 	{
 		$p = 0; // current position
 		$max = strlen($response); // max position for checks, to protect against broken responses
 
-		$results = array ();
-		for ( $ires=0; $ires<$nreqs && $p<$max; $ires++ )
+		$results = array();
+		for ($ires = 0; $ires<$nreqs && $p<$max; $ires++)
 		{
 			$results[] = array();
-			$result =& $results[$ires];
+			$result = & $results[$ires];
 
 			$result["error"] = "";
 			$result["warning"] = "";
 
 			// extract status
-			list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			list(,$status) = unpack("N*", substr($response, $p, 4)); $p += 4;
 			$result["status"] = $status;
-			if ( $status!=SEARCHD_OK )
+			if ($status!=SEARCHD_OK)
 			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$message = substr ( $response, $p, $len ); $p += $len;
+				list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+				$message = substr($response, $p, $len); $p += $len;
 
-				if ( $status==SEARCHD_WARNING )
+				if ($status==SEARCHD_WARNING)
 				{
 					$result["warning"] = $message;
 				} else
@@ -1290,138 +1290,138 @@ 
 			}
 
 			// read schema
-			$fields = array ();
-			$attrs = array ();
+			$fields = array();
+			$attrs = array();
 
-			list(,$nfields) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nfields-->0 && $p<$max )
+			list(,$nfields) = unpack("N*", substr($response, $p, 4)); $p += 4;
+			while ($nfields-->0 && $p<$max)
 			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$fields[] = substr ( $response, $p, $len ); $p += $len;
+				list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+				$fields[] = substr($response, $p, $len); $p += $len;
 			}
 			$result["fields"] = $fields;
 
-			list(,$nattrs) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nattrs-->0 && $p<$max  )
+			list(,$nattrs) = unpack("N*", substr($response, $p, 4)); $p += 4;
+			while ($nattrs-->0 && $p<$max)
 			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$attr = substr ( $response, $p, $len ); $p += $len;
-				list(,$type) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+				$attr = substr($response, $p, $len); $p += $len;
+				list(,$type) = unpack("N*", substr($response, $p, 4)); $p += 4;
 				$attrs[$attr] = $type;
 			}
 			$result["attrs"] = $attrs;
 
 			// read match count
-			list(,$count) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			list(,$id64) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			list(,$count) = unpack("N*", substr($response, $p, 4)); $p += 4;
+			list(,$id64) = unpack("N*", substr($response, $p, 4)); $p += 4;
 
 			// read matches
 			$idx = -1;
-			while ( $count-->0 && $p<$max )
+			while ($count-->0 && $p<$max)
 			{
 				// index into result array
 				$idx++;
 
 				// parse document id and weight
-				if ( $id64 )
+				if ($id64)
 				{
-					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
-					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+					$doc = sphUnpackU64(substr($response, $p, 8)); $p += 8;
+					list(,$weight) = unpack("N*", substr($response, $p, 4)); $p += 4;
 				}
 				else
 				{
-					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
-						substr ( $response, $p, 8 ) ) );
+					list ($doc, $weight) = array_values(unpack("N*N*",
+						substr($response, $p, 8)));
 					$p += 8;
 					$doc = sphFixUint($doc);
 				}
-				$weight = sprintf ( "%u", $weight );
+				$weight = sprintf("%u", $weight);
 
 				// create match entry
-				if ( $this->_arrayresult )
-					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
+				if ($this->_arrayresult)
+					$result["matches"][$idx] = array("id"=>$doc, "weight"=>$weight);
 				else
 					$result["matches"][$doc]["weight"] = $weight;
 
 				// parse and create attributes
-				$attrvals = array ();
-				foreach ( $attrs as $attr=>$type )
+				$attrvals = array();
+				foreach ($attrs as $attr=>$type)
 				{
 					// handle 64bit ints
-					if ( $type==SPH_ATTR_BIGINT )
+					if ($type==SPH_ATTR_BIGINT)
 					{
-						$attrvals[$attr] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
+						$attrvals[$attr] = sphUnpackI64(substr($response, $p, 8)); $p += 8;
 						continue;
 					}
 
 					// handle floats
-					if ( $type==SPH_ATTR_FLOAT )
+					if ($type==SPH_ATTR_FLOAT)
 					{
-						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
+						list(,$uval) = unpack("N*", substr($response, $p, 4)); $p += 4;
+						list(,$fval) = unpack("f*", pack("L", $uval)); 
 						$attrvals[$attr] = $fval;
 						continue;
 					}
 
 					// handle everything else as unsigned ints
-					list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-					if ( $type==SPH_ATTR_MULTI )
+					list(,$val) = unpack("N*", substr($response, $p, 4)); $p += 4;
+					if ($type==SPH_ATTR_MULTI)
 					{
-						$attrvals[$attr] = array ();
+						$attrvals[$attr] = array();
 						$nvalues = $val;
-						while ( $nvalues-->0 && $p<$max )
+						while ($nvalues-->0 && $p<$max)
 						{
-							list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+							list(,$val) = unpack("N*", substr($response, $p, 4)); $p += 4;
 							$attrvals[$attr][] = sphFixUint($val);
 						}
-					} else if ( $type==SPH_ATTR_MULTI64 )
+					} else if ($type==SPH_ATTR_MULTI64)
 					{
-						$attrvals[$attr] = array ();
+						$attrvals[$attr] = array();
 						$nvalues = $val;
-						while ( $nvalues>0 && $p<$max )
+						while ($nvalues>0 && $p<$max)
 						{
-							$attrvals[$attr][] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
+							$attrvals[$attr][] = sphUnpackI64(substr($response, $p, 8)); $p += 8;
 							$nvalues -= 2;
 						}
-					} else if ( $type==SPH_ATTR_STRING )
+					} else if ($type==SPH_ATTR_STRING)
 					{
-						$attrvals[$attr] = substr ( $response, $p, $val );
+						$attrvals[$attr] = substr($response, $p, $val);
 						$p += $val;						
-					} else if ( $type==SPH_ATTR_FACTORS )
+					} else if ($type==SPH_ATTR_FACTORS)
 					{
-						$attrvals[$attr] = substr ( $response, $p, $val-4 );
-						$p += $val-4;						
+						$attrvals[$attr] = substr($response, $p, $val - 4);
+						$p += $val - 4;						
 					} else
 					{
 						$attrvals[$attr] = sphFixUint($val);
 					}
 				}
 
-				if ( $this->_arrayresult )
+				if ($this->_arrayresult)
 					$result["matches"][$idx]["attrs"] = $attrvals;
 				else
 					$result["matches"][$doc]["attrs"] = $attrvals;
 			}
 
-			list ( $total, $total_found, $msecs, $words ) =
-				array_values ( unpack ( "N*N*N*N*", substr ( $response, $p, 16 ) ) );
-			$result["total"] = sprintf ( "%u", $total );
-			$result["total_found"] = sprintf ( "%u", $total_found );
-			$result["time"] = sprintf ( "%.3f", $msecs/1000 );
+			list ($total, $total_found, $msecs, $words) =
+				array_values(unpack("N*N*N*N*", substr($response, $p, 16)));
+			$result["total"] = sprintf("%u", $total);
+			$result["total_found"] = sprintf("%u", $total_found);
+			$result["time"] = sprintf("%.3f", $msecs / 1000);
 			$p += 16;
 
-			while ( $words-->0 && $p<$max )
+			while ($words-->0 && $p<$max)
 			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$word = substr ( $response, $p, $len ); $p += $len;
-				list ( $docs, $hits ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
-				$result["words"][$word] = array (
-					"docs"=>sprintf ( "%u", $docs ),
-					"hits"=>sprintf ( "%u", $hits ) );
+				list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+				$word = substr($response, $p, $len); $p += $len;
+				list ($docs, $hits) = array_values(unpack("N*N*", substr($response, $p, 8))); $p += 8;
+				$result["words"][$word] = array(
+					"docs"=>sprintf("%u", $docs),
+					"hits"=>sprintf("%u", $hits) );
 			}
 		}
 
-		$this->_MBPop ();
+		$this->_MBPop();
 		return $results;
 	}
 
@@ -1432,16 +1432,16 @@ 
 	/// connect to searchd server, and generate exceprts (snippets)
 	/// of given documents for given query. returns false on failure,
 	/// an array of snippets on success
-	function BuildExcerpts ( $docs, $index, $words, $opts=array() )
+	function BuildExcerpts($docs, $index, $words, $opts = array())
 	{
-		assert ( is_array($docs) );
-		assert ( is_string($index) );
-		assert ( is_string($words) );
-		assert ( is_array($opts) );
+		assert(is_array($docs));
+		assert(is_string($index));
+		assert(is_string($words));
+		assert(is_array($opts));
 
-		$this->_MBPush ();
+		$this->_MBPush();
 
-		if (!( $fp = $this->_Connect() ))
+		if (!($fp = $this->_Connect()))
 		{
 			$this->_MBPop();
 			return false;
@@ -1451,26 +1451,26 @@ 
 		// fixup options
 		/////////////////
 
-		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
-		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
-		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
-		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
-		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
-		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
-		if ( !isset($opts["around"]) )				$opts["around"] = 5;
-		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
-		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
-		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
-		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
-		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
-		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
-		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
-		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
-		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
-		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
-		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
-		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
-		if ( !isset($opts["load_files_scattered"]) )		$opts["load_files_scattered"] = false;
+		if (!isset($opts["before_match"]))		$opts["before_match"] = "<b>";
+		if (!isset($opts["after_match"]))			$opts["after_match"] = "</b>";
+		if (!isset($opts["chunk_separator"]))		$opts["chunk_separator"] = " ... ";
+		if (!isset($opts["limit"]))				$opts["limit"] = 256;
+		if (!isset($opts["limit_passages"]))		$opts["limit_passages"] = 0;
+		if (!isset($opts["limit_words"]))			$opts["limit_words"] = 0;
+		if (!isset($opts["around"]))				$opts["around"] = 5;
+		if (!isset($opts["exact_phrase"]))		$opts["exact_phrase"] = false;
+		if (!isset($opts["single_passage"]))		$opts["single_passage"] = false;
+		if (!isset($opts["use_boundaries"]))		$opts["use_boundaries"] = false;
+		if (!isset($opts["weight_order"]))		$opts["weight_order"] = false;
+		if (!isset($opts["query_mode"]))			$opts["query_mode"] = false;
+		if (!isset($opts["force_all_words"]))		$opts["force_all_words"] = false;
+		if (!isset($opts["start_passage_id"]))	$opts["start_passage_id"] = 1;
+		if (!isset($opts["load_files"]))			$opts["load_files"] = false;
+		if (!isset($opts["html_strip_mode"]))		$opts["html_strip_mode"] = "index";
+		if (!isset($opts["allow_empty"]))			$opts["allow_empty"] = false;
+		if (!isset($opts["passage_boundary"]))	$opts["passage_boundary"] = "none";
+		if (!isset($opts["emit_zones"]))			$opts["emit_zones"] = false;
+		if (!isset($opts["load_files_scattered"]))		$opts["load_files_scattered"] = false;
 		
 
 		/////////////////
@@ -1479,35 +1479,35 @@ 
 
 		// v.1.2 req
 		$flags = 1; // remove spaces
-		if ( $opts["exact_phrase"] )	$flags |= 2;
-		if ( $opts["single_passage"] )	$flags |= 4;
-		if ( $opts["use_boundaries"] )	$flags |= 8;
-		if ( $opts["weight_order"] )	$flags |= 16;
-		if ( $opts["query_mode"] )		$flags |= 32;
-		if ( $opts["force_all_words"] )	$flags |= 64;
-		if ( $opts["load_files"] )		$flags |= 128;
-		if ( $opts["allow_empty"] )		$flags |= 256;
-		if ( $opts["emit_zones"] )		$flags |= 512;
-		if ( $opts["load_files_scattered"] )	$flags |= 1024;
-		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", strlen($words) ) . $words; // req words
+		if ($opts["exact_phrase"])	$flags |= 2;
+		if ($opts["single_passage"])	$flags |= 4;
+		if ($opts["use_boundaries"])	$flags |= 8;
+		if ($opts["weight_order"])	$flags |= 16;
+		if ($opts["query_mode"])		$flags |= 32;
+		if ($opts["force_all_words"])	$flags |= 64;
+		if ($opts["load_files"])		$flags |= 128;
+		if ($opts["allow_empty"])		$flags |= 256;
+		if ($opts["emit_zones"])		$flags |= 512;
+		if ($opts["load_files_scattered"])	$flags |= 1024;
+		$req = pack("NN", 0, $flags); // mode=0, flags=$flags
+		$req .= pack("N", strlen($index)).$index; // req index
+		$req .= pack("N", strlen($words)).$words; // req words
 
 		// options
-		$req .= pack ( "N", strlen($opts["before_match"]) ) . $opts["before_match"];
-		$req .= pack ( "N", strlen($opts["after_match"]) ) . $opts["after_match"];
-		$req .= pack ( "N", strlen($opts["chunk_separator"]) ) . $opts["chunk_separator"];
-		$req .= pack ( "NN", (int)$opts["limit"], (int)$opts["around"] );
-		$req .= pack ( "NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"] ); // v.1.2
-		$req .= pack ( "N", strlen($opts["html_strip_mode"]) ) . $opts["html_strip_mode"];
-		$req .= pack ( "N", strlen($opts["passage_boundary"]) ) . $opts["passage_boundary"];
+		$req .= pack("N", strlen($opts["before_match"])).$opts["before_match"];
+		$req .= pack("N", strlen($opts["after_match"])).$opts["after_match"];
+		$req .= pack("N", strlen($opts["chunk_separator"])).$opts["chunk_separator"];
+		$req .= pack("NN", (int)$opts["limit"], (int)$opts["around"]);
+		$req .= pack("NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"]); // v.1.2
+		$req .= pack("N", strlen($opts["html_strip_mode"])).$opts["html_strip_mode"];
+		$req .= pack("N", strlen($opts["passage_boundary"])).$opts["passage_boundary"];
 
 		// documents
-		$req .= pack ( "N", count($docs) );
-		foreach ( $docs as $doc )
+		$req .= pack("N", count($docs));
+		foreach ($docs as $doc)
 		{
-			assert ( is_string($doc) );
-			$req .= pack ( "N", strlen($doc) ) . $doc;
+			assert(is_string($doc));
+			$req .= pack("N", strlen($doc)).$doc;
 		}
 
 		////////////////////////////
@@ -1515,11 +1515,11 @@ 
 		////////////////////////////
 
 		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_EXCERPT ) ) )
+		$req = pack("nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len).$req; // add header
+		if (!($this->_Send($fp, $req, $len + 8)) ||
+			 !($response = $this->_GetResponse($fp, VER_COMMAND_EXCERPT)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return false;
 		}
 
@@ -1528,24 +1528,24 @@ 
 		//////////////////
 
 		$pos = 0;
-		$res = array ();
+		$res = array();
 		$rlen = strlen($response);
-		for ( $i=0; $i<count($docs); $i++ )
+		for ($i = 0; $i<count($docs); $i++)
 		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+			list(,$len) = unpack("N*", substr($response, $pos, 4));
 			$pos += 4;
 
-			if ( $pos+$len > $rlen )
+			if ($pos + $len>$rlen)
 			{
 				$this->_error = "incomplete reply";
-				$this->_MBPop ();
+				$this->_MBPop();
 				return false;
 			}
-			$res[] = $len ? substr ( $response, $pos, $len ) : "";
+			$res[] = $len ? substr($response, $pos, $len) : "";
 			$pos += $len;
 		}
 
-		$this->_MBPop ();
+		$this->_MBPop();
 		return $res;
 	}
 
@@ -1557,15 +1557,15 @@ 
 	/// connect to searchd server, and generate keyword list for a given query
 	/// returns false on failure,
 	/// an array of words on success
-	function BuildKeywords ( $query, $index, $hits )
+	function BuildKeywords($query, $index, $hits)
 	{
-		assert ( is_string($query) );
-		assert ( is_string($index) );
-		assert ( is_bool($hits) );
+		assert(is_string($query));
+		assert(is_string($index));
+		assert(is_bool($hits));
 
-		$this->_MBPush ();
+		$this->_MBPush();
 
-		if (!( $fp = $this->_Connect() ))
+		if (!($fp = $this->_Connect()))
 		{
 			$this->_MBPop();
 			return false;
@@ -1576,20 +1576,20 @@ 
 		/////////////////
 
 		// v.1.0 req
-		$req  = pack ( "N", strlen($query) ) . $query; // req query
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", (int)$hits );
+		$req  = pack("N", strlen($query)).$query; // req query
+		$req .= pack("N", strlen($index)).$index; // req index
+		$req .= pack("N", (int)$hits);
 
 		////////////////////////////
 		// send query, get response
 		////////////////////////////
 
 		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ) )
+		$req = pack("nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len).$req; // add header
+		if (!($this->_Send($fp, $req, $len + 8)) ||
+			 !($response = $this->_GetResponse($fp, VER_COMMAND_KEYWORDS)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return false;
 		}
 
@@ -1598,48 +1598,48 @@ 
 		//////////////////
 
 		$pos = 0;
-		$res = array ();
+		$res = array();
 		$rlen = strlen($response);
-		list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+		list(,$nwords) = unpack("N*", substr($response, $pos, 4));
 		$pos += 4;
-		for ( $i=0; $i<$nwords; $i++ )
+		for ($i = 0; $i<$nwords; $i++)
 		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$tokenized = $len ? substr ( $response, $pos, $len ) : "";
+			list(,$len) = unpack("N*", substr($response, $pos, 4)); $pos += 4;
+			$tokenized = $len ? substr($response, $pos, $len) : "";
 			$pos += $len;
 
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$normalized = $len ? substr ( $response, $pos, $len ) : "";
+			list(,$len) = unpack("N*", substr($response, $pos, 4)); $pos += 4;
+			$normalized = $len ? substr($response, $pos, $len) : "";
 			$pos += $len;
 
-			$res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
+			$res[] = array("tokenized"=>$tokenized, "normalized"=>$normalized);
 
-			if ( $hits )
+			if ($hits)
 			{
-				list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
+				list($ndocs, $nhits) = array_values(unpack("N*N*", substr($response, $pos, 8)));
 				$pos += 8;
 				$res [$i]["docs"] = $ndocs;
 				$res [$i]["hits"] = $nhits;
 			}
 
-			if ( $pos > $rlen )
+			if ($pos>$rlen)
 			{
 				$this->_error = "incomplete reply";
-				$this->_MBPop ();
+				$this->_MBPop();
 				return false;
 			}
 		}
 
-		$this->_MBPop ();
+		$this->_MBPop();
 		return $res;
 	}
 
-	function EscapeString ( $string )
+	function EscapeString($string)
 	{
-		$from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=', '<' );
-		$to   = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=', '\<' );
+		$from = array('\\', '(', ')', '|', '-', '!', '@', '~', '"', '&', '/', '^', '$', '=', '<');
+		$to   = array('\\\\', '\(', '\)', '\|', '\-', '\!', '\@', '\~', '\"', '\&', '\/', '\^', '\$', '\=', '\<');
 
-		return str_replace ( $from, $to, $string );
+		return str_replace($from, $to, $string);
 	}
 
 	/////////////////////////////////////////////////////////////////////////////
@@ -1648,84 +1648,84 @@ 
 
 	/// batch update given attributes in given rows in given indexes
 	/// returns amount of updated documents (0 or more) on success, or -1 on failure
-	function UpdateAttributes ( $index, $attrs, $values, $mva=false, $ignorenonexistent=false )
+	function UpdateAttributes($index, $attrs, $values, $mva = false, $ignorenonexistent = false)
 	{
 		// verify everything
-		assert ( is_string($index) );
-		assert ( is_bool($mva) );
-		assert ( is_bool($ignorenonexistent) );
+		assert(is_string($index));
+		assert(is_bool($mva));
+		assert(is_bool($ignorenonexistent));
 
-		assert ( is_array($attrs) );
-		foreach ( $attrs as $attr )
-			assert ( is_string($attr) );
+		assert(is_array($attrs));
+		foreach ($attrs as $attr)
+			assert(is_string($attr));
 
-		assert ( is_array($values) );
-		foreach ( $values as $id=>$entry )
+		assert(is_array($values));
+		foreach ($values as $id=>$entry)
 		{
-			assert ( is_numeric($id) );
-			assert ( is_array($entry) );
-			assert ( count($entry)==count($attrs) );
-			foreach ( $entry as $v )
+			assert(is_numeric($id));
+			assert(is_array($entry));
+			assert(count($entry)==count($attrs));
+			foreach ($entry as $v)
 			{
-				if ( $mva )
+				if ($mva)
 				{
-					assert ( is_array($v) );
-					foreach ( $v as $vv )
-						assert ( is_int($vv) );
+					assert(is_array($v));
+					foreach ($v as $vv)
+						assert(is_int($vv));
 				} else
-					assert ( is_int($v) );
+					assert(is_int($v));
 			}
 		}
 
 		// build request
-		$this->_MBPush ();
-		$req = pack ( "N", strlen($index) ) . $index;
+		$this->_MBPush();
+		$req = pack("N", strlen($index)).$index;
 
-		$req .= pack ( "N", count($attrs) );
-		$req .= pack ( "N", $ignorenonexistent ? 1 : 0 );
-		foreach ( $attrs as $attr )
+		$req .= pack("N", count($attrs));
+		$req .= pack("N", $ignorenonexistent ? 1 : 0);
+		foreach ($attrs as $attr)
 		{
-			$req .= pack ( "N", strlen($attr) ) . $attr;
-			$req .= pack ( "N", $mva ? 1 : 0 );
+			$req .= pack("N", strlen($attr)).$attr;
+			$req .= pack("N", $mva ? 1 : 0);
 		}
 
-		$req .= pack ( "N", count($values) );
-		foreach ( $values as $id=>$entry )
+		$req .= pack("N", count($values));
+		foreach ($values as $id=>$entry)
 		{
-			$req .= sphPackU64 ( $id );
-			foreach ( $entry as $v )
+			$req .= sphPackU64($id);
+			foreach ($entry as $v)
 			{
-				$req .= pack ( "N", $mva ? count($v) : $v );
-				if ( $mva )
-					foreach ( $v as $vv )
-						$req .= pack ( "N", $vv );
+				$req .= pack("N", $mva ? count($v) : $v);
+				if ($mva)
+					foreach ($v as $vv)
+						$req .= pack("N", $vv);
 			}
 		}
 
 		// connect, send query, get response
-		if (!( $fp = $this->_Connect() ))
+		if (!($fp = $this->_Connect()))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return -1;
 		}
 
 		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len ) . $req; // add header
-		if ( !$this->_Send ( $fp, $req, $len+8 ) )
+		$req = pack("nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len).$req; // add header
+		if (!$this->_Send($fp, $req, $len + 8))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return -1;
 		}
 
-		if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_UPDATE ) ))
+		if (!($response = $this->_GetResponse($fp, VER_COMMAND_UPDATE)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return -1;
 		}
 
 		// parse response
-		list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
-		$this->_MBPop ();
+		list(,$updated) = unpack("N*", substr($response, 0, 4));
+		$this->_MBPop();
 		return $updated;
 	}
 
@@ -1735,17 +1735,17 @@ 
 
 	function Open()
 	{
-		if ( $this->_socket !== false )
+		if ($this->_socket!==false)
 		{
 			$this->_error = 'already connected';
 			return false;
 		}
-		if ( !$fp = $this->_Connect() )
+		if (!$fp = $this->_Connect())
 			return false;
 
 		// command, command version = 0, body length = 4, body = 1
-		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
-		if ( !$this->_Send ( $fp, $req, 12 ) )
+		$req = pack("nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1);
+		if (!$this->_Send($fp, $req, 12))
 			return false;
 
 		$this->_socket = $fp;
@@ -1754,13 +1754,13 @@ 
 
 	function Close()
 	{
-		if ( $this->_socket === false )
+		if ($this->_socket===false)
 		{
 			$this->_error = 'not connected';
 			return false;
 		}
 
-		fclose ( $this->_socket );
+		fclose($this->_socket);
 		$this->_socket = false;
 		
 		return true;
@@ -1770,38 +1770,38 @@ 
 	// status
 	//////////////////////////////////////////////////////////////////////////
 
-	function Status ($session=false)
+	function Status($session = false)
 	{
-        assert ( is_bool($session) );
+        assert(is_bool($session));
 
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
+		$this->_MBPush();
+		if (!($fp = $this->_Connect()))
 		{
 			$this->_MBPop();
 			return false;
 		}
 
-		$req = pack ( "nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, $session?0:1 ); // len=4, body=1
-		if ( !( $this->_Send ( $fp, $req, 12 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_STATUS ) ) )
+		$req = pack("nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, $session ? 0 : 1); // len=4, body=1
+		if (!($this->_Send($fp, $req, 12)) ||
+			 !($response = $this->_GetResponse($fp, VER_COMMAND_STATUS)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return false;
 		}
 
-		$res = substr ( $response, 4 ); // just ignore length, error handling, etc
+		$res = substr($response, 4); // just ignore length, error handling, etc
 		$p = 0;
-		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
+		list ($rows, $cols) = array_values(unpack("N*N*", substr($response, $p, 8))); $p += 8;
 
 		$res = array();
-		for ( $i=0; $i<$rows; $i++ )
-			for ( $j=0; $j<$cols; $j++ )
+		for ($i = 0; $i<$rows; $i++)
+			for ($j = 0; $j<$cols; $j++)
 		{
-			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
+			list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+			$res[$i][] = substr($response, $p, $len); $p += $len;
 		}
 
-		$this->_MBPop ();
+		$this->_MBPop();
 		return $res;
 	}
 
@@ -1809,30 +1809,30 @@ 
 	// flush
 	//////////////////////////////////////////////////////////////////////////
 
-	function FlushAttributes ()
+	function FlushAttributes()
 	{
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
+		$this->_MBPush();
+		if (!($fp = $this->_Connect()))
 		{
 			$this->_MBPop();
 			return -1;
 		}
 
-		$req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
-		if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
+		$req = pack("nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0); // len=0
+		if (!($this->_Send($fp, $req, 8)) ||
+			 !($response = $this->_GetResponse($fp, VER_COMMAND_FLUSHATTRS)))
 		{
-			$this->_MBPop ();
+			$this->_MBPop();
 			return -1;
 		}
 
 		$tag = -1;
-		if ( strlen($response)==4 )
-			list(,$tag) = unpack ( "N*", $response );
+		if (strlen($response)==4)
+			list(,$tag) = unpack("N*", $response);
 		else
 			$this->_error = "unexpected response length";
 
-		$this->_MBPop ();
+		$this->_MBPop();
 		return $tag;
 	}
 }

Braces +276 added lines, -149 removed lines

@@ -150,14 +150,16 @@ 
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", $v < 0 ? -1 : 0, $v );
+	if ( is_int($v) ) {
+			return pack ( "NN", $v < 0 ? -1 : 0, $v );
+	}
 
 	// x32, bcmath	
 	if ( function_exists("bcmul") )
 	{
-		if ( bccomp ( $v, 0 ) == -1 )
-			$v = bcadd ( "18446744073709551616", $v );
+		if ( bccomp ( $v, 0 ) == -1 ) {
+					$v = bcadd ( "18446744073709551616", $v );
+		}
 		$h = bcdiv ( $v, "4294967296", 0 );
 		$l = bcmod ( $v, "4294967296" );
 		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
@@ -175,9 +177,9 @@ 
 
 	if ( $v<0 )
 	{
-		if ( $l==0 )
-			$h = 4294967296.0 - $h;
-		else
+		if ( $l==0 ) {
+					$h = 4294967296.0 - $h;
+		} else
 		{
 			$h = 4294967295.0 - $h;
 			$l = 4294967296.0 - $l;
@@ -197,8 +199,9 @@ 
 		assert ( $v>=0 );
 		
 		// x64, int
-		if ( is_int($v) )
-			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		if ( is_int($v) ) {
+					return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		}
 						  
 		// x64, bcmath
 		if ( function_exists("bcmul") )
@@ -221,8 +224,9 @@ 
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", 0, $v );
+	if ( is_int($v) ) {
+			return pack ( "NN", 0, $v );
+	}
 	
 	// x32, bcmath
 	if ( function_exists("bcmul") )
@@ -252,16 +256,23 @@ 
 
 	if ( PHP_INT_SIZE>=8 )
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ( $hi<0 ) {
+			$hi += (1<<32);
+		}
+		// because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) {
+			$lo += (1<<32);
+		}
 
 		// x64, int
-		if ( $hi<=2147483647 )
-			return ($hi<<32) + $lo;
+		if ( $hi<=2147483647 ) {
+					return ($hi<<32) + $lo;
+		}
 
 		// x64, bcmath
-		if ( function_exists("bcmul") )
-			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+		if ( function_exists("bcmul") ) {
+					return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+		}
 
 		// x64, no-bcmath
 		$C = 100000;
@@ -273,16 +284,18 @@ 
 			$l  = $l % $C;
 		}
 
-		if ( $h==0 )
-			return $l;
+		if ( $h==0 ) {
+					return $l;
+		}
 		return sprintf ( "%d%05d", $h, $l );
 	}
 
 	// x32, int
 	if ( $hi==0 )
 	{
-		if ( $lo>0 )
-			return $lo;
+		if ( $lo>0 ) {
+					return $lo;
+		}
 		return sprintf ( "%u", $lo );
 	}
 
@@ -290,8 +303,9 @@ 
 	$lo = sprintf ( "%u", $lo );
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	if ( function_exists("bcmul") ) {
+			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	}
 	
 	// x32, no-bcmath
 	$hi = (float)$hi;
@@ -306,8 +320,9 @@ 
 
 	$h = sprintf ( "%.0f", $h );
 	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return sprintf( "%.0f", (float)$l );
+	if ( $h=="0" ) {
+			return sprintf( "%.0f", (float)$l );
+	}
 	return $h . $l;
 }
 
@@ -319,8 +334,13 @@ 
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ( $hi<0 ) {
+			$hi += (1<<32);
+		}
+		// because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) {
+			$lo += (1<<32);
+		}
 
 		return ($hi<<32) + $lo;
 	}
@@ -328,15 +348,17 @@ 
 	// x32, int
 	if ( $hi==0 )
 	{
-		if ( $lo>0 )
-			return $lo;
+		if ( $lo>0 ) {
+					return $lo;
+		}
 		return sprintf ( "%u", $lo );
 	}
 	// x32, int
 	elseif ( $hi==-1 )
 	{
-		if ( $lo<0 )
-			return $lo;
+		if ( $lo<0 ) {
+					return $lo;
+		}
 		return sprintf ( "%.0f", $lo - 4294967296.0 );
 	}
 	
@@ -354,8 +376,9 @@ 
 	$lo = sprintf ( "%u", $lo );
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+	if ( function_exists("bcmul") ) {
+			return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+	}
 
 	// x32, no-bcmath
 	$hi = (float)$hi;
@@ -375,8 +398,9 @@ 
 
 	$h = sprintf ( "%.0f", $h );
 	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return $neg . sprintf( "%.0f", (float)$l );
+	if ( $h=="0" ) {
+			return $neg . sprintf( "%.0f", (float)$l );
+	}
 	return $neg . $h . $l;
 }
 
@@ -386,10 +410,11 @@ 
 	if ( PHP_INT_SIZE>=8 )
 	{
 		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
+		if ( $value<0 ) {
+			$value += (1<<32);
+		}
 		return $value;
-	}
-	else
+	} else
 	{
 		// x32 route, workaround php signed/unsigned braindamage
 		return sprintf ( "%u", $value );
@@ -514,8 +539,9 @@ 
 
 	function __destruct()
 	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
+		if ( $this->_socket !== false ) {
+					fclose ( $this->_socket );
+		}
 	}
 
 	/// get last error message (string)
@@ -593,8 +619,9 @@ 
 	/// leave mbstring workaround mode
 	function _MBPop ()
 	{
-		if ( $this->_mbenc )
-			mb_internal_encoding ( $this->_mbenc );
+		if ( $this->_mbenc ) {
+					mb_internal_encoding ( $this->_mbenc );
+		}
 	}
 
 	/// connect to searchd server
@@ -604,8 +631,9 @@ 
 		{
 			// we are in persistent connection mode, so we have a socket
 			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
-				return $this->_socket;
+			if ( !@feof ( $this->_socket ) ) {
+							return $this->_socket;
+			}
 
 			// force reopen
 			$this->_socket = false;
@@ -619,24 +647,25 @@ 
 		{
 			$host = $this->_path;
 			$port = 0;
-		}
-		else
+		} else
 		{
 			$host = $this->_host;
 			$port = $this->_port;
 		}
 
-		if ( $this->_timeout<=0 )
-			$fp = @fsockopen ( $host, $port, $errno, $errstr );
-		else
-			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+		if ( $this->_timeout<=0 ) {
+					$fp = @fsockopen ( $host, $port, $errno, $errstr );
+		} else {
+					$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+		}
 		
 		if ( !$fp )
 		{
-			if ( $this->_path )
-				$location = $this->_path;
-			else
-				$location = "{$this->_host}:{$this->_port}";
+			if ( $this->_path ) {
+							$location = $this->_path;
+			} else {
+							$location = "{$this->_host}:{$this->_port}";
+			}
 			
 			$errstr = trim ( $errstr );
 			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
@@ -689,8 +718,9 @@ 
 				}
 			}
 		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
+		if ( $this->_socket === false ) {
+					fclose ( $fp );
+		}
 
 		// check response
 		$read = strlen ( $response );
@@ -750,10 +780,12 @@ 
 		assert ( $max>=0 );
 		$this->_offset = $offset;
 		$this->_limit = $limit;
-		if ( $max>0 )
-			$this->_maxmatches = $max;
-		if ( $cutoff>0 )
-			$this->_cutoff = $cutoff;
+		if ( $max>0 ) {
+					$this->_maxmatches = $max;
+		}
+		if ( $cutoff>0 ) {
+					$this->_cutoff = $cutoff;
+		}
 	}
 
 	/// set maximum query time, in milliseconds, per-index
@@ -857,8 +889,9 @@ 
 
 		if ( is_array($values) && count($values) )
 		{
-			foreach ( $values as $value )
-				assert ( is_numeric($value) );
+			foreach ( $values as $value ) {
+							assert ( is_numeric($value) );
+			}
 
 			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
 		}
@@ -987,18 +1020,32 @@ 
 		assert ( isset ( $flag_name, $known_names ) );
 		assert ( in_array( $flag_value, $flags[$flag_name], true ) || ( $flag_name=="max_predicted_time" && is_int ( $flag_value ) && $flag_value>=0 ) );
 		
-		if ( $flag_name=="reverse_scan" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 0, $flag_value==1 );
-		if ( $flag_name=="sort_method" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 1, $flag_value=="kbuffer" );
+		if ( $flag_name=="reverse_scan" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 0, $flag_value==1 );
+		}
+		if ( $flag_name=="sort_method" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 1, $flag_value=="kbuffer" );
+		}
 		if ( $flag_name=="max_predicted_time" )
 		{
 			$this->_query_flags = sphSetBit ( $this->_query_flags, 2, $flag_value>0 );
 			$this->_predictedtime = (int)$flag_value;
 		}
-		if ( $flag_name=="boolean_simplify" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 3, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="normalized" || $flag_value=="plain" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 4, $flag_value=="plain" );
-		if ( $flag_name=="global_idf" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 5, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 6, $flag_value=="tfidf_normalized" );
-		if ( $flag_name=="low_priority" ) $this->_query_flags = sphSetBit ( $this->_query_flags, 8, $flag_value );
+		if ( $flag_name=="boolean_simplify" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 3, $flag_value );
+		}
+		if ( $flag_name=="idf" && ( $flag_value=="normalized" || $flag_value=="plain" ) ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 4, $flag_value=="plain" );
+		}
+		if ( $flag_name=="global_idf" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 5, $flag_value );
+		}
+		if ( $flag_name=="idf" && ( $flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized" ) ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 6, $flag_value=="tfidf_normalized" );
+		}
+		if ( $flag_name=="low_priority" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 8, $flag_value );
+		}
 	}
 	
 	/// set outer order by parameters
@@ -1067,15 +1114,18 @@ 
 		$results = $this->RunQueries ();
 		$this->_reqs = array (); // just in case it failed too early
 
-		if ( !is_array($results) )
-			return false; // probably network error; error message should be already filled
+		if ( !is_array($results) ) {
+					return false;
+		}
+		// probably network error; error message should be already filled
 
 		$this->_error = $results[0]["error"];
 		$this->_warning = $results[0]["warning"];
-		if ( $results[0]["status"]==SEARCHD_ERROR )
-			return false;
-		else
-			return $results[0];
+		if ( $results[0]["status"]==SEARCHD_ERROR ) {
+					return false;
+		} else {
+					return $results[0];
+		}
 	}
 
 	/// helper to pack floats in network byte order
@@ -1095,14 +1145,16 @@ 
 
 		// build request
 		$req = pack ( "NNNNN", $this->_query_flags, $this->_offset, $this->_limit, $this->_mode, $this->_ranker );
-		if ( $this->_ranker==SPH_RANK_EXPR )
-			$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
+		if ( $this->_ranker==SPH_RANK_EXPR ) {
+					$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
+		}
 		$req .= pack ( "N", $this->_sort ); // (deprecated) sort mode
 		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
 		$req .= pack ( "N", strlen($query) ) . $query; // query itself
 		$req .= pack ( "N", count($this->_weights) ); // weights
-		foreach ( $this->_weights as $weight )
-			$req .= pack ( "N", (int)$weight );
+		foreach ( $this->_weights as $weight ) {
+					$req .= pack ( "N", (int)$weight );
+		}
 		$req .= pack ( "N", strlen($index) ) . $index; // indexes
 		$req .= pack ( "N", 1 ); // id64 range marker
 		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
@@ -1117,8 +1169,9 @@ 
 			{
 				case SPH_FILTER_VALUES:
 					$req .= pack ( "N", count($filter["values"]) );
-					foreach ( $filter["values"] as $value )
-						$req .= sphPackI64 ( $value );
+					foreach ( $filter["values"] as $value ) {
+											$req .= sphPackI64 ( $value );
+					}
 					break;
 
 				case SPH_FILTER_RANGE:
@@ -1161,16 +1214,18 @@ 
 
 		// per-index weights
 		$req .= pack ( "N", count($this->_indexweights) );
-		foreach ( $this->_indexweights as $idx=>$weight )
-			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+		foreach ( $this->_indexweights as $idx=>$weight ) {
+					$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+		}
 
 		// max query time
 		$req .= pack ( "N", $this->_maxquerytime );
 
 		// per-field weights
 		$req .= pack ( "N", count($this->_fieldweights) );
-		foreach ( $this->_fieldweights as $field=>$weight )
-			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+		foreach ( $this->_fieldweights as $field=>$weight ) {
+					$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+		}
 
 		// comment
 		$req .= pack ( "N", strlen($comment) ) . $comment;
@@ -1200,15 +1255,17 @@ 
 		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
 		
 		// max_predicted_time
-		if ( $this->_predictedtime>0 )
-			$req .= pack ( "N", (int)$this->_predictedtime );
+		if ( $this->_predictedtime>0 ) {
+					$req .= pack ( "N", (int)$this->_predictedtime );
+		}
 			
 		$req .= pack ( "N", strlen($this->_outerorderby) ) . $this->_outerorderby;
 		$req .= pack ( "NN", $this->_outeroffset, $this->_outerlimit );
-		if ( $this->_hasouter )
-			$req .= pack ( "N", 1 );
-		else
-			$req .= pack ( "N", 0 );
+		if ( $this->_hasouter ) {
+					$req .= pack ( "N", 1 );
+		} else {
+					$req .= pack ( "N", 0 );
+		}
 
 		// mbstring workaround
 		$this->_MBPop ();
@@ -1327,8 +1384,7 @@ 
 				{
 					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
 					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				}
-				else
+				} else
 				{
 					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
 						substr ( $response, $p, 8 ) ) );
@@ -1338,10 +1394,11 @@ 
 				$weight = sprintf ( "%u", $weight );
 
 				// create match entry
-				if ( $this->_arrayresult )
-					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
-				else
-					$result["matches"][$doc]["weight"] = $weight;
+				if ( $this->_arrayresult ) {
+									$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
+				} else {
+									$result["matches"][$doc]["weight"] = $weight;
+				}
 
 				// parse and create attributes
 				$attrvals = array ();
@@ -1397,10 +1454,11 @@ 
 					}
 				}
 
-				if ( $this->_arrayresult )
-					$result["matches"][$idx]["attrs"] = $attrvals;
-				else
-					$result["matches"][$doc]["attrs"] = $attrvals;
+				if ( $this->_arrayresult ) {
+									$result["matches"][$idx]["attrs"] = $attrvals;
+				} else {
+									$result["matches"][$doc]["attrs"] = $attrvals;
+				}
 			}
 
 			list ( $total, $total_found, $msecs, $words ) =
@@ -1451,26 +1509,66 @@ 
 		// fixup options
 		/////////////////
 
-		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
-		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
-		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
-		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
-		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
-		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
-		if ( !isset($opts["around"]) )				$opts["around"] = 5;
-		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
-		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
-		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
-		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
-		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
-		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
-		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
-		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
-		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
-		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
-		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
-		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
-		if ( !isset($opts["load_files_scattered"]) )		$opts["load_files_scattered"] = false;
+		if ( !isset($opts["before_match"]) ) {
+			$opts["before_match"] = "<b>";
+		}
+		if ( !isset($opts["after_match"]) ) {
+			$opts["after_match"] = "</b>";
+		}
+		if ( !isset($opts["chunk_separator"]) ) {
+			$opts["chunk_separator"] = " ... ";
+		}
+		if ( !isset($opts["limit"]) ) {
+			$opts["limit"] = 256;
+		}
+		if ( !isset($opts["limit_passages"]) ) {
+			$opts["limit_passages"] = 0;
+		}
+		if ( !isset($opts["limit_words"]) ) {
+			$opts["limit_words"] = 0;
+		}
+		if ( !isset($opts["around"]) ) {
+			$opts["around"] = 5;
+		}
+		if ( !isset($opts["exact_phrase"]) ) {
+			$opts["exact_phrase"] = false;
+		}
+		if ( !isset($opts["single_passage"]) ) {
+			$opts["single_passage"] = false;
+		}
+		if ( !isset($opts["use_boundaries"]) ) {
+			$opts["use_boundaries"] = false;
+		}
+		if ( !isset($opts["weight_order"]) ) {
+			$opts["weight_order"] = false;
+		}
+		if ( !isset($opts["query_mode"]) ) {
+			$opts["query_mode"] = false;
+		}
+		if ( !isset($opts["force_all_words"]) ) {
+			$opts["force_all_words"] = false;
+		}
+		if ( !isset($opts["start_passage_id"]) ) {
+			$opts["start_passage_id"] = 1;
+		}
+		if ( !isset($opts["load_files"]) ) {
+			$opts["load_files"] = false;
+		}
+		if ( !isset($opts["html_strip_mode"]) ) {
+			$opts["html_strip_mode"] = "index";
+		}
+		if ( !isset($opts["allow_empty"]) ) {
+			$opts["allow_empty"] = false;
+		}
+		if ( !isset($opts["passage_boundary"]) ) {
+			$opts["passage_boundary"] = "none";
+		}
+		if ( !isset($opts["emit_zones"]) ) {
+			$opts["emit_zones"] = false;
+		}
+		if ( !isset($opts["load_files_scattered"]) ) {
+			$opts["load_files_scattered"] = false;
+		}
 		
 
 		/////////////////
@@ -1479,16 +1577,36 @@ 
 
 		// v.1.2 req
 		$flags = 1; // remove spaces
-		if ( $opts["exact_phrase"] )	$flags |= 2;
-		if ( $opts["single_passage"] )	$flags |= 4;
-		if ( $opts["use_boundaries"] )	$flags |= 8;
-		if ( $opts["weight_order"] )	$flags |= 16;
-		if ( $opts["query_mode"] )		$flags |= 32;
-		if ( $opts["force_all_words"] )	$flags |= 64;
-		if ( $opts["load_files"] )		$flags |= 128;
-		if ( $opts["allow_empty"] )		$flags |= 256;
-		if ( $opts["emit_zones"] )		$flags |= 512;
-		if ( $opts["load_files_scattered"] )	$flags |= 1024;
+		if ( $opts["exact_phrase"] ) {
+			$flags |= 2;
+		}
+		if ( $opts["single_passage"] ) {
+			$flags |= 4;
+		}
+		if ( $opts["use_boundaries"] ) {
+			$flags |= 8;
+		}
+		if ( $opts["weight_order"] ) {
+			$flags |= 16;
+		}
+		if ( $opts["query_mode"] ) {
+			$flags |= 32;
+		}
+		if ( $opts["force_all_words"] ) {
+			$flags |= 64;
+		}
+		if ( $opts["load_files"] ) {
+			$flags |= 128;
+		}
+		if ( $opts["allow_empty"] ) {
+			$flags |= 256;
+		}
+		if ( $opts["emit_zones"] ) {
+			$flags |= 512;
+		}
+		if ( $opts["load_files_scattered"] ) {
+			$flags |= 1024;
+		}
 		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
 		$req .= pack ( "N", strlen($index) ) . $index; // req index
 		$req .= pack ( "N", strlen($words) ) . $words; // req words
@@ -1656,8 +1774,9 @@ 
 		assert ( is_bool($ignorenonexistent) );
 
 		assert ( is_array($attrs) );
-		foreach ( $attrs as $attr )
-			assert ( is_string($attr) );
+		foreach ( $attrs as $attr ) {
+					assert ( is_string($attr) );
+		}
 
 		assert ( is_array($values) );
 		foreach ( $values as $id=>$entry )
@@ -1670,10 +1789,12 @@ 
 				if ( $mva )
 				{
 					assert ( is_array($v) );
-					foreach ( $v as $vv )
-						assert ( is_int($vv) );
-				} else
-					assert ( is_int($v) );
+					foreach ( $v as $vv ) {
+											assert ( is_int($vv) );
+					}
+				} else {
+									assert ( is_int($v) );
+				}
 			}
 		}
 
@@ -1696,9 +1817,10 @@ 
 			foreach ( $entry as $v )
 			{
 				$req .= pack ( "N", $mva ? count($v) : $v );
-				if ( $mva )
-					foreach ( $v as $vv )
+				if ( $mva ) {
+									foreach ( $v as $vv )
 						$req .= pack ( "N", $vv );
+				}
 			}
 		}
 
@@ -1740,13 +1862,15 @@ 
 			$this->_error = 'already connected';
 			return false;
 		}
-		if ( !$fp = $this->_Connect() )
-			return false;
+		if ( !$fp = $this->_Connect() ) {
+					return false;
+		}
 
 		// command, command version = 0, body length = 4, body = 1
 		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
-		if ( !$this->_Send ( $fp, $req, 12 ) )
-			return false;
+		if ( !$this->_Send ( $fp, $req, 12 ) ) {
+					return false;
+		}
 
 		$this->_socket = $fp;
 		return true;
@@ -1794,8 +1918,10 @@ 
 		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
 
 		$res = array();
-		for ( $i=0; $i<$rows; $i++ )
-			for ( $j=0; $j<$cols; $j++ )
+		for ( $i=0; $i<$rows; $i++ ) {
+					for ( $j=0;
+		}
+		$j<$cols; $j++ )
 		{
 			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
 			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
@@ -1827,10 +1953,11 @@ 
 		}
 
 		$tag = -1;
-		if ( strlen($response)==4 )
-			list(,$tag) = unpack ( "N*", $response );
-		else
-			$this->_error = "unexpected response length";
+		if ( strlen($response)==4 ) {
+					list(,$tag) = unpack ( "N*", $response );
+		} else {
+					$this->_error = "unexpected response length";
+		}
 
 		$this->_MBPop ();
 		return $tag;

src/test.php

Spacing +76 added lines, -76 removed lines

@@ -11,40 +11,40 @@ 
 //////////////////////
 
 // for very old PHP versions, like at my home test server
-if ( is_array($argv) && !isset($_SERVER["argv"]) )
+if (is_array($argv) && !isset($_SERVER["argv"]))
 	$_SERVER["argv"] = $argv;
-unset ( $_SERVER["argv"][0] );
+unset ($_SERVER["argv"][0]);
 
 // build query
-if ( !is_array($_SERVER["argv"]) || empty($_SERVER["argv"]) )
+if (!is_array($_SERVER["argv"]) || empty($_SERVER["argv"]))
 {
-	print ( "Usage: php -f test.php [OPTIONS] query words\n\n" );
-	print ( "Options are:\n" );
-	print ( "-h, --host <HOST>\tconnect to searchd at host HOST\n" );
-	print ( "-p, --port\t\tconnect to searchd at port PORT\n" );
-	print ( "-i, --index <IDX>\tsearch through index(es) specified by IDX\n" );
-	print ( "-s, --sortby <CLAUSE>\tsort matches by 'CLAUSE' in sort_extended mode\n" );
-	print ( "-S, --sortexpr <EXPR>\tsort matches by 'EXPR' DESC in sort_expr mode\n" );
-	print ( "-a, --any\t\tuse 'match any word' matching mode\n" );
-	print ( "-b, --boolean\t\tuse 'boolean query' matching mode\n" );
-	print ( "-e, --extended\t\tuse 'extended query' matching mode\n" );
-	print ( "-ph,--phrase\t\tuse 'exact phrase' matching mode\n" );
-	print ( "-f, --filter <ATTR>\tfilter by attribute 'ATTR' (default is 'group_id')\n" );
-	print ( "-fr,--filterrange <ATTR> <MIN> <MAX>\n\t\t\tadd specified range filter\n" );
-	print ( "-v, --value <VAL>\tadd VAL to allowed 'group_id' values list\n" );
-	print ( "-g, --groupby <EXPR>\tgroup matches by 'EXPR'\n" );
-	print ( "-gs,--groupsort <EXPR>\tsort groups by 'EXPR'\n" );
-	print ( "-d, --distinct <ATTR>\tcount distinct values of 'ATTR''\n" );
-	print ( "-l, --limit <COUNT>\tretrieve COUNT matches (default: 20)\n" );
-	print ( "--select <EXPRLIST>\tuse 'EXPRLIST' as select-list (default: *)\n" );
+	print ("Usage: php -f test.php [OPTIONS] query words\n\n");
+	print ("Options are:\n");
+	print ("-h, --host <HOST>\tconnect to searchd at host HOST\n");
+	print ("-p, --port\t\tconnect to searchd at port PORT\n");
+	print ("-i, --index <IDX>\tsearch through index(es) specified by IDX\n");
+	print ("-s, --sortby <CLAUSE>\tsort matches by 'CLAUSE' in sort_extended mode\n");
+	print ("-S, --sortexpr <EXPR>\tsort matches by 'EXPR' DESC in sort_expr mode\n");
+	print ("-a, --any\t\tuse 'match any word' matching mode\n");
+	print ("-b, --boolean\t\tuse 'boolean query' matching mode\n");
+	print ("-e, --extended\t\tuse 'extended query' matching mode\n");
+	print ("-ph,--phrase\t\tuse 'exact phrase' matching mode\n");
+	print ("-f, --filter <ATTR>\tfilter by attribute 'ATTR' (default is 'group_id')\n");
+	print ("-fr,--filterrange <ATTR> <MIN> <MAX>\n\t\t\tadd specified range filter\n");
+	print ("-v, --value <VAL>\tadd VAL to allowed 'group_id' values list\n");
+	print ("-g, --groupby <EXPR>\tgroup matches by 'EXPR'\n");
+	print ("-gs,--groupsort <EXPR>\tsort groups by 'EXPR'\n");
+	print ("-d, --distinct <ATTR>\tcount distinct values of 'ATTR''\n");
+	print ("-l, --limit <COUNT>\tretrieve COUNT matches (default: 20)\n");
+	print ("--select <EXPRLIST>\tuse 'EXPRLIST' as select-list (default: *)\n");
 	exit;
 }
 
 $args = array();
-foreach ( $_SERVER["argv"] as $arg )
+foreach ($_SERVER["argv"] as $arg)
 	$args[] = $arg;
 
-$cl = new SphinxClient ();
+$cl = new SphinxClient();
 
 $q = "";
 $sql = "";
@@ -62,96 +62,96 @@ 
 $limit = 20;
 $ranker = SPH_RANK_PROXIMITY_BM25;
 $select = "";
-for ( $i=0; $i<count($args); $i++ )
+for ($i = 0; $i<count($args); $i++)
 {
 	$arg = $args[$i];
 
-	if ( $arg=="-h" || $arg=="--host" )				$host = $args[++$i];
-	else if ( $arg=="-p" || $arg=="--port" )		$port = (int)$args[++$i];
-	else if ( $arg=="-i" || $arg=="--index" )		$index = $args[++$i];
-	else if ( $arg=="-s" || $arg=="--sortby" )		{ $sortby = $args[++$i]; $sortexpr = ""; }
-	else if ( $arg=="-S" || $arg=="--sortexpr" )	{ $sortexpr = $args[++$i]; $sortby = ""; }
-	else if ( $arg=="-a" || $arg=="--any" )			$mode = SPH_MATCH_ANY;
-	else if ( $arg=="-b" || $arg=="--boolean" )		$mode = SPH_MATCH_BOOLEAN;
-	else if ( $arg=="-e" || $arg=="--extended" )	$mode = SPH_MATCH_EXTENDED;
-	else if ( $arg=="-e2" )							$mode = SPH_MATCH_EXTENDED2;
-	else if ( $arg=="-ph"|| $arg=="--phrase" )		$mode = SPH_MATCH_PHRASE;
-	else if ( $arg=="-f" || $arg=="--filter" )		$filter = $args[++$i];
-	else if ( $arg=="-v" || $arg=="--value" )		$filtervals[] = $args[++$i];
-	else if ( $arg=="-g" || $arg=="--groupby" )		$groupby = $args[++$i];
-	else if ( $arg=="-gs"|| $arg=="--groupsort" )	$groupsort = $args[++$i];
-	else if ( $arg=="-d" || $arg=="--distinct" )	$distinct = $args[++$i];
-	else if ( $arg=="-l" || $arg=="--limit" )		$limit = (int)$args[++$i];
-	else if ( $arg=="--select" )					$select = $args[++$i];
-	else if ( $arg=="-fr"|| $arg=="--filterrange" )	$cl->SetFilterRange ( $args[++$i], $args[++$i], $args[++$i] );
-	else if ( $arg=="-r" )
+	if ($arg=="-h" || $arg=="--host")				$host = $args[++$i];
+	else if ($arg=="-p" || $arg=="--port")		$port = (int)$args[++$i];
+	else if ($arg=="-i" || $arg=="--index")		$index = $args[++$i];
+	else if ($arg=="-s" || $arg=="--sortby") { $sortby = $args[++$i]; $sortexpr = ""; }
+	else if ($arg=="-S" || $arg=="--sortexpr") { $sortexpr = $args[++$i]; $sortby = ""; }
+	else if ($arg=="-a" || $arg=="--any")			$mode = SPH_MATCH_ANY;
+	else if ($arg=="-b" || $arg=="--boolean")		$mode = SPH_MATCH_BOOLEAN;
+	else if ($arg=="-e" || $arg=="--extended")	$mode = SPH_MATCH_EXTENDED;
+	else if ($arg=="-e2")							$mode = SPH_MATCH_EXTENDED2;
+	else if ($arg=="-ph" || $arg=="--phrase")		$mode = SPH_MATCH_PHRASE;
+	else if ($arg=="-f" || $arg=="--filter")		$filter = $args[++$i];
+	else if ($arg=="-v" || $arg=="--value")		$filtervals[] = $args[++$i];
+	else if ($arg=="-g" || $arg=="--groupby")		$groupby = $args[++$i];
+	else if ($arg=="-gs" || $arg=="--groupsort")	$groupsort = $args[++$i];
+	else if ($arg=="-d" || $arg=="--distinct")	$distinct = $args[++$i];
+	else if ($arg=="-l" || $arg=="--limit")		$limit = (int)$args[++$i];
+	else if ($arg=="--select")					$select = $args[++$i];
+	else if ($arg=="-fr" || $arg=="--filterrange")	$cl->SetFilterRange($args[++$i], $args[++$i], $args[++$i]);
+	else if ($arg=="-r")
 	{
 		$arg = strtolower($args[++$i]);
-		if ( $arg=="bm25" )		$ranker = SPH_RANK_BM25;
-		if ( $arg=="none" )		$ranker = SPH_RANK_NONE;
-		if ( $arg=="wordcount" )$ranker = SPH_RANK_WORDCOUNT;
-		if ( $arg=="fieldmask" )$ranker = SPH_RANK_FIELDMASK;
-		if ( $arg=="sph04" )	$ranker = SPH_RANK_SPH04;
+		if ($arg=="bm25")		$ranker = SPH_RANK_BM25;
+		if ($arg=="none")		$ranker = SPH_RANK_NONE;
+		if ($arg=="wordcount")$ranker = SPH_RANK_WORDCOUNT;
+		if ($arg=="fieldmask")$ranker = SPH_RANK_FIELDMASK;
+		if ($arg=="sph04")	$ranker = SPH_RANK_SPH04;
 	}
 	else
-		$q .= $args[$i] . " ";
+		$q .= $args[$i]." ";
 }
 
 ////////////
 // do query
 ////////////
 
-$cl->SetServer ( $host, $port );
-$cl->SetConnectTimeout ( 1 );
-$cl->SetArrayResult ( true );
-$cl->SetMatchMode ( $mode );
-if ( count($filtervals) )	$cl->SetFilter ( $filter, $filtervals );
-if ( $groupby )				$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );
-if ( $sortby )				$cl->SetSortMode ( SPH_SORT_EXTENDED, $sortby );
-if ( $sortexpr )			$cl->SetSortMode ( SPH_SORT_EXPR, $sortexpr );
-if ( $distinct )			$cl->SetGroupDistinct ( $distinct );
-if ( $select )				$cl->SetSelect ( $select );
-if ( $limit )				$cl->SetLimits ( 0, $limit, ( $limit>1000 ) ? $limit : 1000 );
-$cl->SetRankingMode ( $ranker );
-$res = $cl->Query ( $q, $index );
+$cl->SetServer($host, $port);
+$cl->SetConnectTimeout(1);
+$cl->SetArrayResult(true);
+$cl->SetMatchMode($mode);
+if (count($filtervals))	$cl->SetFilter($filter, $filtervals);
+if ($groupby)				$cl->SetGroupBy($groupby, SPH_GROUPBY_ATTR, $groupsort);
+if ($sortby)				$cl->SetSortMode(SPH_SORT_EXTENDED, $sortby);
+if ($sortexpr)			$cl->SetSortMode(SPH_SORT_EXPR, $sortexpr);
+if ($distinct)			$cl->SetGroupDistinct($distinct);
+if ($select)				$cl->SetSelect($select);
+if ($limit)				$cl->SetLimits(0, $limit, ($limit>1000) ? $limit : 1000);
+$cl->SetRankingMode($ranker);
+$res = $cl->Query($q, $index);
 
 ////////////////
 // print me out
 ////////////////
 
-if ( $res===false )
+if ($res===false)
 {
-	print "Query failed: " . $cl->GetLastError() . ".\n";
+	print "Query failed: ".$cl->GetLastError().".\n";
 
 } else
 {
-	if ( $cl->GetLastWarning() )
-		print "WARNING: " . $cl->GetLastWarning() . "\n\n";
+	if ($cl->GetLastWarning())
+		print "WARNING: ".$cl->GetLastWarning()."\n\n";
 
 	print "Query '$q' retrieved $res[total] of $res[total_found] matches in $res[time] sec.\n";
 	print "Query stats:\n";
-	if ( is_array($res["words"]) )
-		foreach ( $res["words"] as $word => $info )
+	if (is_array($res["words"]))
+		foreach ($res["words"] as $word => $info)
 			print "    '$word' found $info[hits] times in $info[docs] documents\n";
 	print "\n";
 
-	if ( is_array($res["matches"]) )
+	if (is_array($res["matches"]))
 	{
 		$n = 1;
 		print "Matches:\n";
-		foreach ( $res["matches"] as $docinfo )
+		foreach ($res["matches"] as $docinfo)
 		{
 			print "$n. doc_id=$docinfo[id], weight=$docinfo[weight]";
-			foreach ( $res["attrs"] as $attrname => $attrtype )
+			foreach ($res["attrs"] as $attrname => $attrtype)
 			{
 				$value = $docinfo["attrs"][$attrname];
-				if ( $attrtype==SPH_ATTR_MULTI || $attrtype==SPH_ATTR_MULTI64 )
+				if ($attrtype==SPH_ATTR_MULTI || $attrtype==SPH_ATTR_MULTI64)
 				{
-					$value = "(" . join ( ",", $value ) .")";
+					$value = "(".join(",", $value).")";
 				} else
 				{
-					if ( $attrtype==SPH_ATTR_TIMESTAMP )
-						$value = date ( "Y-m-d H:i:s", $value );
+					if ($attrtype==SPH_ATTR_TIMESTAMP)
+						$value = date("Y-m-d H:i:s", $value);
 				}
 				print ", $attrname=$value";
 			}

Braces +85 added lines, -42 removed lines

@@ -11,8 +11,9 @@ 
 //////////////////////
 
 // for very old PHP versions, like at my home test server
-if ( is_array($argv) && !isset($_SERVER["argv"]) )
+if ( is_array($argv) && !isset($_SERVER["argv"]) ) {
 	$_SERVER["argv"] = $argv;
+}
 unset ( $_SERVER["argv"][0] );
 
 // build query
@@ -41,8 +42,9 @@ 
 }
 
 $args = array();
-foreach ( $_SERVER["argv"] as $arg )
+foreach ( $_SERVER["argv"] as $arg ) {
 	$args[] = $arg;
+}
 
 $cl = new SphinxClient ();
 
@@ -66,36 +68,60 @@ 
 {
 	$arg = $args[$i];
 
-	if ( $arg=="-h" || $arg=="--host" )				$host = $args[++$i];
-	else if ( $arg=="-p" || $arg=="--port" )		$port = (int)$args[++$i];
-	else if ( $arg=="-i" || $arg=="--index" )		$index = $args[++$i];
-	else if ( $arg=="-s" || $arg=="--sortby" )		{ $sortby = $args[++$i]; $sortexpr = ""; }
-	else if ( $arg=="-S" || $arg=="--sortexpr" )	{ $sortexpr = $args[++$i]; $sortby = ""; }
-	else if ( $arg=="-a" || $arg=="--any" )			$mode = SPH_MATCH_ANY;
-	else if ( $arg=="-b" || $arg=="--boolean" )		$mode = SPH_MATCH_BOOLEAN;
-	else if ( $arg=="-e" || $arg=="--extended" )	$mode = SPH_MATCH_EXTENDED;
-	else if ( $arg=="-e2" )							$mode = SPH_MATCH_EXTENDED2;
-	else if ( $arg=="-ph"|| $arg=="--phrase" )		$mode = SPH_MATCH_PHRASE;
-	else if ( $arg=="-f" || $arg=="--filter" )		$filter = $args[++$i];
-	else if ( $arg=="-v" || $arg=="--value" )		$filtervals[] = $args[++$i];
-	else if ( $arg=="-g" || $arg=="--groupby" )		$groupby = $args[++$i];
-	else if ( $arg=="-gs"|| $arg=="--groupsort" )	$groupsort = $args[++$i];
-	else if ( $arg=="-d" || $arg=="--distinct" )	$distinct = $args[++$i];
-	else if ( $arg=="-l" || $arg=="--limit" )		$limit = (int)$args[++$i];
-	else if ( $arg=="--select" )					$select = $args[++$i];
-	else if ( $arg=="-fr"|| $arg=="--filterrange" )	$cl->SetFilterRange ( $args[++$i], $args[++$i], $args[++$i] );
-	else if ( $arg=="-r" )
+	if ( $arg=="-h" || $arg=="--host" ) {
+		$host = $args[++$i];
+	} else if ( $arg=="-p" || $arg=="--port" ) {
+		$port = (int)$args[++$i];
+	} else if ( $arg=="-i" || $arg=="--index" ) {
+		$index = $args[++$i];
+	} else if ( $arg=="-s" || $arg=="--sortby" )		{ $sortby = $args[++$i]; $sortexpr = ""; } else if ( $arg=="-S" || $arg=="--sortexpr" )	{ $sortexpr = $args[++$i]; $sortby = ""; } else if ( $arg=="-a" || $arg=="--any" ) {
+		$mode = SPH_MATCH_ANY;
+	} else if ( $arg=="-b" || $arg=="--boolean" ) {
+		$mode = SPH_MATCH_BOOLEAN;
+	} else if ( $arg=="-e" || $arg=="--extended" ) {
+		$mode = SPH_MATCH_EXTENDED;
+	} else if ( $arg=="-e2" ) {
+		$mode = SPH_MATCH_EXTENDED2;
+	} else if ( $arg=="-ph"|| $arg=="--phrase" ) {
+		$mode = SPH_MATCH_PHRASE;
+	} else if ( $arg=="-f" || $arg=="--filter" ) {
+		$filter = $args[++$i];
+	} else if ( $arg=="-v" || $arg=="--value" ) {
+		$filtervals[] = $args[++$i];
+	} else if ( $arg=="-g" || $arg=="--groupby" ) {
+		$groupby = $args[++$i];
+	} else if ( $arg=="-gs"|| $arg=="--groupsort" ) {
+		$groupsort = $args[++$i];
+	} else if ( $arg=="-d" || $arg=="--distinct" ) {
+		$distinct = $args[++$i];
+	} else if ( $arg=="-l" || $arg=="--limit" ) {
+		$limit = (int)$args[++$i];
+	} else if ( $arg=="--select" ) {
+		$select = $args[++$i];
+	} else if ( $arg=="-fr"|| $arg=="--filterrange" ) {
+		$cl->SetFilterRange ( $args[++$i], $args[++$i], $args[++$i] );
+	} else if ( $arg=="-r" )
 	{
 		$arg = strtolower($args[++$i]);
-		if ( $arg=="bm25" )		$ranker = SPH_RANK_BM25;
-		if ( $arg=="none" )		$ranker = SPH_RANK_NONE;
-		if ( $arg=="wordcount" )$ranker = SPH_RANK_WORDCOUNT;
-		if ( $arg=="fieldmask" )$ranker = SPH_RANK_FIELDMASK;
-		if ( $arg=="sph04" )	$ranker = SPH_RANK_SPH04;
+		if ( $arg=="bm25" ) {
+			$ranker = SPH_RANK_BM25;
+		}
+		if ( $arg=="none" ) {
+			$ranker = SPH_RANK_NONE;
+		}
+		if ( $arg=="wordcount" ) {
+			$ranker = SPH_RANK_WORDCOUNT;
+		}
+		if ( $arg=="fieldmask" ) {
+			$ranker = SPH_RANK_FIELDMASK;
+		}
+		if ( $arg=="sph04" ) {
+			$ranker = SPH_RANK_SPH04;
+		}
+	} else {
+			$q .= $args[$i] . " ";
+	}
 	}
-	else
-		$q .= $args[$i] . " ";
-}
 
 ////////////
 // do query
@@ -105,13 +131,27 @@ 
 $cl->SetConnectTimeout ( 1 );
 $cl->SetArrayResult ( true );
 $cl->SetMatchMode ( $mode );
-if ( count($filtervals) )	$cl->SetFilter ( $filter, $filtervals );
-if ( $groupby )				$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );
-if ( $sortby )				$cl->SetSortMode ( SPH_SORT_EXTENDED, $sortby );
-if ( $sortexpr )			$cl->SetSortMode ( SPH_SORT_EXPR, $sortexpr );
-if ( $distinct )			$cl->SetGroupDistinct ( $distinct );
-if ( $select )				$cl->SetSelect ( $select );
-if ( $limit )				$cl->SetLimits ( 0, $limit, ( $limit>1000 ) ? $limit : 1000 );
+if ( count($filtervals) ) {
+	$cl->SetFilter ( $filter, $filtervals );
+}
+if ( $groupby ) {
+	$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );
+}
+if ( $sortby ) {
+	$cl->SetSortMode ( SPH_SORT_EXTENDED, $sortby );
+}
+if ( $sortexpr ) {
+	$cl->SetSortMode ( SPH_SORT_EXPR, $sortexpr );
+}
+if ( $distinct ) {
+	$cl->SetGroupDistinct ( $distinct );
+}
+if ( $select ) {
+	$cl->SetSelect ( $select );
+}
+if ( $limit ) {
+	$cl->SetLimits ( 0, $limit, ( $limit>1000 ) ? $limit : 1000 );
+}
 $cl->SetRankingMode ( $ranker );
 $res = $cl->Query ( $q, $index );
 
@@ -125,14 +165,16 @@ 
 
 } else
 {
-	if ( $cl->GetLastWarning() )
-		print "WARNING: " . $cl->GetLastWarning() . "\n\n";
+	if ( $cl->GetLastWarning() ) {
+			print "WARNING: " . $cl->GetLastWarning() . "\n\n";
+	}
 
 	print "Query '$q' retrieved $res[total] of $res[total_found] matches in $res[time] sec.\n";
 	print "Query stats:\n";
-	if ( is_array($res["words"]) )
-		foreach ( $res["words"] as $word => $info )
+	if ( is_array($res["words"]) ) {
+			foreach ( $res["words"] as $word => $info )
 			print "    '$word' found $info[hits] times in $info[docs] documents\n";
+	}
 	print "\n";
 
 	if ( is_array($res["matches"]) )
@@ -150,8 +192,9 @@ 
 					$value = "(" . join ( ",", $value ) .")";
 				} else
 				{
-					if ( $attrtype==SPH_ATTR_TIMESTAMP )
-						$value = date ( "Y-m-d H:i:s", $value );
+					if ( $attrtype==SPH_ATTR_TIMESTAMP ) {
+											$value = date ( "Y-m-d H:i:s", $value );
+					}
 				}
 				print ", $attrname=$value";
 			}