sphinxapi.0.9.8.php in riddle-1.5.2

- old
+ new

@@ -210,11 +210,11 @@
 		$this->_min_id		= 0;
 		$this->_max_id		= 0;
 		$this->_filters		= array ();
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 		$this->_maxmatches	= 1000;
 		$this->_cutoff		= 0;
 		$this->_retrycount	= 0;
 		$this->_retrydelay	= 0;
@@ -601,11 +601,11 @@
 	/// clear groupby settings (for multi-queries)
 	function ResetGroupBy ()
 	{
 		$this->_groupby		= "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
+		$this->_groupsort	= "@weight DESC";
 		$this->_groupdistinct= "";
 	}
 
 	//////////////////////////////////////////////////////////////////////////////
 
@@ -866,11 +866,11 @@
 				{
 					// handle floats
 					if ( $type==SPH_ATTR_FLOAT )
 					{
 						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
+						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) );
 						$attrvals[$attr] = $fval;
 						continue;
 					}
 
 					// handle everything else as unsigned ints
@@ -1036,11 +1036,11 @@
 		assert ( is_string($index) );
 		assert ( is_bool($hits) );
 
     // Commented out for testing Riddle
     // $this->_MBPush ();
-    // 
+    //
     // if (!( $fp = $this->_Connect() ))
     // {
     //  $this->_MBPop();
     //  return false;
     // }
@@ -1051,11 +1051,11 @@
 
 		// 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 );
-		
+
 		// Line for testing Riddle:
 		return $req;
 
 		////////////////////////////
 		// send query, get response
@@ -1159,11 +1159,11 @@
 				$req .= pack ( "N", $v );
 		}
 
 		// Line for testing Riddle:
 		return $req;
-		
+
 		// mbstring workaround
 		$this->_MBPush ();
 
 		// connect, send query, get response
 		if (!( $fp = $this->_Connect() ))
@@ -1185,11 +1185,11 @@
 		// parse response
 		list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
 		$this->_MBPop ();
 		return $updated;
 	}
-	
+
 	// Function for Riddle, copied from internal code.
 	function FilterOutput()
 	{
 		foreach ( $this->_filters as $filter )
 		{
@@ -1214,10 +1214,10 @@
 				default:
 					assert ( 0 && "internal error: unhandled filter type" );
 			}
 			$req .= pack ( "N", $filter["exclude"] );
 		}
-		
+
 		return $req;
 	}
 }
 
 //
\ No newline at end of file