Update to version 2.0.1

Author: romainneutron

sphinxapi.php

@@ -1,12 +1,12 @@
 <?php
 
 //
-// $Id: sphinxapi.php 2376 2010-06-29 14:08:19Z shodan $
+// $Id: sphinxapi.php 2758 2011-04-04 11:10:44Z kevg $
 //
 
 //
-// Copyright (c) 2001-2010, Andrew Aksyonoff
-// Copyright (c) 2008-2010, Sphinx Technologies Inc
+// Copyright (c) 2001-2011, Andrew Aksyonoff
+// Copyright (c) 2008-2011, Sphinx Technologies Inc
 // All rights reserved
 //
 // This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,11 @@
 define ( "SEARCHD_COMMAND_KEYWORDS",	3 );
 define ( "SEARCHD_COMMAND_PERSIST",		4 );
 define ( "SEARCHD_COMMAND_STATUS",		5 );
-define ( "SEARCHD_COMMAND_QUERY",		6 );
 define ( "SEARCHD_COMMAND_FLUSHATTRS",	7 );
 
 /// current client-side command implementation versions
-define ( "VER_COMMAND_SEARCH",		0x117 );
-define ( "VER_COMMAND_EXCERPT",		0x102 );
+define ( "VER_COMMAND_SEARCH",		0x118 );
+define ( "VER_COMMAND_EXCERPT",		0x103 );
 define ( "VER_COMMAND_UPDATE",		0x102 );
 define ( "VER_COMMAND_KEYWORDS",	0x100 );
 define ( "VER_COMMAND_STATUS",		0x100 );
@@ -638,7 +637,7 @@ function _GetResponse ( $fp, $client_ver )
 			$left = $len;
 			while ( $left>0 && !feof($fp) )
 			{
-				$chunk = fread ( $fp, $left );
+				$chunk = fread ( $fp, min ( 8192, $left ) );
 				if ( $chunk )
 				{
 					$response .= $chunk;
@@ -1109,8 +1108,8 @@ function RunQueries ()
 		// send query, get response
 		$nreqs = count($this->_reqs);
 		$req = join ( "", $this->_reqs );
-		$len = 4+strlen($req);
-		$req = pack ( "nnNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, $nreqs ) . $req; // add header
+		$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 ) ) )
@@ -1325,6 +1324,8 @@ function BuildExcerpts ( $docs, $index, $words, $opts=array() )
 		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;
 
 		/////////////////
 		// build request
@@ -1340,6 +1341,7 @@ function BuildExcerpts ( $docs, $index, $words, $opts=array() )
 		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;
 		$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
@@ -1351,6 +1353,7 @@ function BuildExcerpts ( $docs, $index, $words, $opts=array() )
 		$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) );
@@ -1684,5 +1687,5 @@ function FlushAttributes ()
 }
 
 //
-// $Id: sphinxapi.php 2376 2010-06-29 14:08:19Z shodan $
+// $Id: sphinxapi.php 2758 2011-04-04 11:10:44Z kevg $
 //