add support for Sphinx search engine

config.php-dist

@@ -164,7 +164,14 @@
 	// intervals is disabled and all articles (which are not starred) 
 	// older than this amount of days are purged.
 
-	define('CONFIG_VERSION', 19);
+	define('SPHINX_ENABLE', false);
+	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
+	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
+
+	define('SPHINX_INDEX', 'ttrss');
+	// Index name in Sphinx configuration
+
+	define('CONFIG_VERSION', 20);
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).
 

functions.php

@@ -106,6 +106,7 @@
 	require_once 'version.php';
 
 	require_once 'lib/phpmailer/class.phpmailer.php';
+	require_once 'lib/sphinxapi.php';
 
 	define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
 	define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
@@ -3289,9 +3290,19 @@
 		$ext_tables_part = "";
 
 			if ($search) {
-			
+
-				$search_query_part = getSearchSql($search, $match_on);
+				if (SPHINX_ENABLED) {
-				$search_query_part .= " AND ";
+					$ids = join(",", @sphinx_search($search, 0, 500));
+
+					if ($ids) 
+						$search_query_part = "ref_id IN ($ids) AND ";
+					else
+						$search_query_part = "ref_id = -1 AND ";
+
+				} else {
+					$search_query_part = getSearchSql($search, $match_on);
+					$search_query_part .= " AND ";
+				}				
 
 			} else {
 				$search_query_part = "";
@@ -7123,4 +7134,33 @@
 		}
 	}
 
+	function sphinx_search($query, $offset = 0, $limit = 30) {
+		$sphinxClient = new SphinxClient();
+
+		$sphinxClient->SetServer('localhost', 9312);
+		$sphinxClient->SetConnectTimeout(1);
+
+		$sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30, 
+			'feed_title' => 20));
+
+		$sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
+		$sphinxClient->SetRankingMode(SPH_RANK_PROXIMITY_BM25);
+		$sphinxClient->SetLimits($offset, $limit, 1000);
+		$sphinxClient->SetArrayResult(false);
+		$sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
+		
+		$result = $sphinxClient->Query($query, SPHINX_INDEX);
+
+		$ids = array();
+
+		if (is_array($result['matches'])) {
+			foreach (array_keys($result['matches']) as $int_id) {
+				$ref_id = $result['matches'][$int_id]['attrs']['ref_id'];
+				array_push($ids, $ref_id);
+			}
+		}
+
+		return $ids;
+	}
+
 ?>

modules/popup-dialog.php

@@ -374,17 +374,23 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input onkeypress=\"return filterCR(event, search)\"
+			if (!SPHINX_ENABLE) {
-				name=\"query\" size=\"20\" type=\"search\"	value=''>";
 
-			print " " . __('match on')." ";
+				print "<input onkeypress=\"return filterCR(event, search)\"
+					name=\"query\" size=\"20\" type=\"search\"	value=''>";
 
-			$search_fields = array(
+				print " " . __('match on')." ";
-				"title" => __("Title"),
-				"content" => __("Content"),
-				"both" => __("Title or content"));
 
-			print_select_hash("match_on", 3, $search_fields); 
+				$search_fields = array(
+					"title" => __("Title"),
+						"content" => __("Content"),
+					"both" => __("Title or content"));
+	
+				print_select_hash("match_on", 3, $search_fields); 
+			} else {
+				print "<input onkeypress=\"return filterCR(event, search)\"
+					name=\"query\" size=\"50\" type=\"search\"	value=''>";
+			}
 
 
 			print "<br/>".__('Limit search to:')." ";

sanity_check.php

@@ -1,7 +1,7 @@
 <?php
 	require_once "functions.php";
 
-	define('EXPECTED_CONFIG_VERSION', 19);
+	define('EXPECTED_CONFIG_VERSION', 20);
 	define('SCHEMA_VERSION', 74);
 
 	if (!file_exists("config.php")) {