Prevent concatenating words for full text search index

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 7ea0bf0c88e3bfa5f811d529623e257203fa8b0b..684f0866ac510690c47db4e9236242fa9aed320f 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1017,7 +1017,8 @@
                                        _debug("RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled);
 
                                        if (DB_TYPE == "pgsql") {
-                                               $tsvector_combined = db_escape_string(mb_substr($entry_title . ' ' . strip_tags($entry_content),
+                                               $entry_content_spaces = str_replace('<', ' <', $entry_content);
+                                               $tsvector_combined = db_escape_string(mb_substr($entry_title . ' ' . strip_tags($entry_content_spaces),
                                                        0, 1000000));
 
                                                $tsvector_qpart = "tsvector_combined = to_tsvector('$feed_language', '$tsvector_combined'),";

diff --git a/update.php b/update.php
index 216a9c1f47758aa7030541a8cb46db5642e2a861..25269bdcfc4a0e0fe1c73dda9659b9f60dab05ca 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -347,7 +347,8 @@
                        $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit");
 
                        while ($line = db_fetch_assoc($result)) {
-                               $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags($line['content']),
+                               $content_separated = str_replace('<', ' <', $line['content']);
+                               $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags($content_separated),
                                        0, 1000000));
 
                                db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]);