merged from rel099 branch upto r2080

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@2081 8b96e2b9-35c5-2c16-bc47-5122d61876d4
smparkes · Nov 18, 2009 · 65b4e80 · 65b4e80
1 parent 7acf1b0
commit 65b4e80
Show file tree

Hide file tree

Showing 44 changed files with 968 additions and 1,006 deletions.
diff --git a/api/java/SphinxClient.java b/api/java/SphinxClient.java
@@ -142,7 +142,7 @@ public class SphinxClient
 	/** Creates a new SphinxClient instance. */
 	public SphinxClient()
 	{
-		this("localhost", 3312);
+		this("localhost", 9312);
 	}
 
 	/** Creates a new SphinxClient instance, with host:port specification. */
@@ -536,7 +536,7 @@ public void SetWeights(int[] weights) throws SphinxException
 	 * Bind per-field weights by field name.
 	 * @param fieldWeights hash which maps String index names to Integer weights
 	 */
-	public void SetFieldeights ( Map fieldWeights ) throws SphinxException
+	public void SetFieldWeights ( Map fieldWeights ) throws SphinxException
 	{
 		/* FIXME! implement checks here */
 		_fieldWeights = ( fieldWeights==null ) ? new LinkedHashMap () : fieldWeights;

diff --git a/api/java/test.java b/api/java/test.java
@@ -41,7 +41,7 @@ public static void main ( String[] argv ) throws SphinxException
 
 		StringBuffer q = new StringBuffer();
 		String host = "localhost";
-		int port = 3312;
+		int port = 9312;
 		int mode = SphinxClient.SPH_MATCH_ALL;
 		String index = "*";
 		int offset = 0;