valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass tsvector data as a named parameter on article update, remove escaping hacks

This commit is contained in:
Andrew Dolgov 2018-04-03 13:57:27 +03:00
parent 4fa64e8446
commit 963c22646b
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
classes/rssutils.php
View File

@ -978,18 +978,10 @@ class RSSUtils {
_debug("resulting RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled); _debug("resulting RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled);
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql")
$tsvector_combined = mb_substr($entry_title . ' ' . $tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
preg_replace('/[<\?\:]/', ' ', strip_tags($entry_content)), else
0, 1000000);
$tsvector_qpart = "tsvector_combined = to_tsvector(".$pdo->quote($feed_language).", ".$pdo->quote($tsvector_combined)."),";
} else {
$tsvector_qpart = ""; $tsvector_qpart = "";
}
//_debug($tsvector_qpart);
$sth = $pdo->prepare("UPDATE ttrss_entries $sth = $pdo->prepare("UPDATE ttrss_entries
SET title = :title, SET title = :title,
@ -1003,7 +995,7 @@ class RSSUtils {
lang = :lang lang = :lang
WHERE id = :id"); WHERE id = :id");
$sth->execute([":title" => $entry_title, $params = [":title" => $entry_title,
":content" => "$entry_content", ":content" => "$entry_content",
":content_hash" => $entry_current_hash, ":content_hash" => $entry_current_hash,
":updated" => $entry_timestamp_fmt, ":updated" => $entry_timestamp_fmt,
@ -1011,7 +1003,14 @@ class RSSUtils {
":plugin_data" => $entry_plugin_data, ":plugin_data" => $entry_plugin_data,
":author" => "$entry_author", ":author" => "$entry_author",
":lang" => $entry_language, ":lang" => $entry_language,
":id" => $ref_id]); ":id" => $ref_id];
if (DB_TYPE == "pgsql") {
$params[":ts_lang"] = $feed_language;
$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 1000000);
}
$sth->execute($params);
// update aux data // update aux data
$sth = $pdo->prepare("UPDATE ttrss_user_entries $sth = $pdo->prepare("UPDATE ttrss_user_entries

4
update.php
View File

@ -366,9 +366,7 @@
while (true) { while (true) {
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
$tsvector_combined = mb_substr($line['title'] . ' ' . $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
preg_replace('/[<\?\:]/', ' ', strip_tags($line['content'])),
0, 1000000);
$usth->execute([$tsvector_combined, $line['id']]); $usth->execute([$tsvector_combined, $line['id']]);