diff --git a/config/sphinxsearch.php b/config/sphinxsearch.php index 4c0d66a90..4e8603607 100644 --- a/config/sphinxsearch.php +++ b/config/sphinxsearch.php @@ -1,6 +1,7 @@ '127.0.0.1', 'port' => 9306, - 'index' => 'releases_rt' + 'index' => 'releases_rt', ]; diff --git a/misc/sphinxsearch/populate_rt_indexes.php b/misc/sphinxsearch/populate_rt_indexes.php index 8bf4e9562..5a495d602 100644 --- a/misc/sphinxsearch/populate_rt_indexes.php +++ b/misc/sphinxsearch/populate_rt_indexes.php @@ -3,8 +3,8 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; use App\Models\Release; -use Illuminate\Support\Facades\DB; use nntmux\SphinxSearch; +use Illuminate\Support\Facades\DB; if (! isset($argv[1]) || $argv[1] !== 'releases_rt') { exit( @@ -47,7 +47,7 @@ function populate_rt($table, $max) $string = sprintf('REPLACE INTO %s %s VALUES ', $table, $rtvalues); $lastId = $minId - 1; - echo "[Starting to populate sphinx RT index $table with $total releases.]" . PHP_EOL; + echo "[Starting to populate sphinx RT index $table with $total releases.]".PHP_EOL; for ($i = $minId; $i <= ($total + $max + $minId); $i += $max) { $rows = DB::select(sprintf($query, $lastId, $max)); DB::commit(); diff --git a/nntmux/NameFixer.php b/nntmux/NameFixer.php index 8c40060f3..9f04ce3f3 100755 --- a/nntmux/NameFixer.php +++ b/nntmux/NameFixer.php @@ -1114,9 +1114,8 @@ class NameFixer $join = ''; if (\strlen($preTitle) >= 15 && preg_match(self::PREDB_REGEX, $preTitle)) { - - $titlematch = SphinxSearch::escapeString($preTitle); - $join .= sprintf( + $titlematch = SphinxSearch::escapeString($preTitle); + $join .= sprintf( 'INNER JOIN releases_se rse ON rse.id = r.id WHERE rse.query = "@(name,searchname,filename) %s;mode=extended"', $titlematch diff --git a/nntmux/ReleaseRemover.php b/nntmux/ReleaseRemover.php index 3197d1176..993da7254 100755 --- a/nntmux/ReleaseRemover.php +++ b/nntmux/ReleaseRemover.php @@ -738,9 +738,7 @@ class ReleaseRemover if ($this->crapTime === '') { $regexMatch = $this->extractSrchFromRegx($dbRegex); if ($regexMatch !== '') { - $ftMatch = sprintf('rse.query = "@(name,searchname) %s;limit=1000000;maxmatches=1000000;mode=any" AND', str_replace('|', ' ', str_replace('"', '', $regexMatch))); - - + $ftMatch = sprintf('rse.query = "@(name,searchname) %s;limit=1000000;maxmatches=1000000;mode=any" AND', str_replace('|', ' ', str_replace('"', '', $regexMatch))); } } diff --git a/nntmux/ReleaseSearch.php b/nntmux/ReleaseSearch.php index e15dcaa01..e2c21d23c 100755 --- a/nntmux/ReleaseSearch.php +++ b/nntmux/ReleaseSearch.php @@ -61,6 +61,7 @@ class ReleaseSearch if ($forceLike) { return $this->likeSQL(); } + return $this->sphinxSQL(); } diff --git a/nntmux/SphinxSearch.php b/nntmux/SphinxSearch.php index c8499e1ef..3106fcbed 100755 --- a/nntmux/SphinxSearch.php +++ b/nntmux/SphinxSearch.php @@ -3,9 +3,9 @@ namespace nntmux; use App\Models\Release; -use Foolz\SphinxQL\Drivers\Pdo\Connection; use Foolz\SphinxQL\Helper; use Foolz\SphinxQL\SphinxQL; +use Foolz\SphinxQL\Drivers\Pdo\Connection; class SphinxSearch { diff --git a/public/pages/search.php b/public/pages/search.php index a0a835cca..ff9ab20de 100644 --- a/public/pages/search.php +++ b/public/pages/search.php @@ -4,7 +4,6 @@ use App\Models\User; use nntmux\Releases; use App\Models\Group; use App\Models\Category; -use nntmux\ReleaseSearch; if (! User::isLoggedIn()) { $page->show403(); @@ -159,8 +158,6 @@ if (isset($_REQUEST['searchadvr']) && ! isset($_REQUEST['id']) && ! isset($_REQU ); } - - $search_description = 'Sphinx Search Rules:
The search is case insensitive.