summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkibbi <[email protected]>2015-08-18 10:13:06 +0200
committerAndrew Dolgov <[email protected]>2015-08-18 12:01:00 +0300
commite22e0d686c16615d25ce806d5a0d22ee7c186913 (patch)
tree8eec1274ed05a572c7839b981af447a1c88fb04b
parente17079dcef4be49082353d71d21918f1722ff039 (diff)
Prevent concatenating words for full text search index
-rw-r--r--include/rssfuncs.php3
-rwxr-xr-xupdate.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 7ea0bf0c8..684f0866a 100644
--- 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 216a9c1f4..25269bdcf 100755
--- 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"]);