From f5a0fb8b64c57e98fcf73369cb4dbb1b31620fd7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 01:29:36 +0300 Subject: queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating --- include/functions2.php | 61 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index 133352f75..e4e66acd1 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -426,9 +426,25 @@ } // $search_mode is obsolete/unused - function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false) { - - if (!$owner_uid) $owner_uid = $_SESSION["uid"]; + //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) { + function queryFeedHeadlines($params) { + + $feed = $params["feed"]; + $limit = isset($params["limit"]) ? $params["limit"] : 30; + $view_mode = $params["view_mode"]; + $cat_view = isset($params["cat_view"]) ? $params["cat_view"] : false; + $search = isset($params["search"]) ? $params["search"] : false; + $override_order = isset($params["override_order"]) ? $params["override_order"] : false; + $offset = isset($params["offset"]) ? $params["offset"] : 0; + $owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"]; + $filter = isset($params["filter"]) ? $params["filter"] : 0; + $since_id = isset($params["since_id"]) ? $params["since_id"] : 0; + $include_children = isset($params["include_children"]) ? $params["include_children"] : false; + $ignore_vfeed_group = isset($params["ignore_vfeed_group"]) ? $params["ignore_vfeed_group"] : false; + $override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false; + $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false; + $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false; + $check_top_id = isset($params["check_top_id"]) ? $params["check_top_id"] : false; $ext_tables_part = ""; $search_words = array(); @@ -711,6 +727,45 @@ $start_ts_query_part = ""; } + + // if previous topmost article id changed that means our current pagination is no longer valid + if ($check_top_id) { + $query = "SELECT DISTINCT + date_entered, + guid, + ttrss_entries.id, + ttrss_entries.title, + updated, + score + FROM + $from_qpart + WHERE + $feed_check_qpart + ttrss_user_entries.ref_id = ttrss_entries.id AND + ttrss_user_entries.owner_uid = '$owner_uid' AND + $search_query_part + $start_ts_query_part + $filter_query_part + $view_query_part + $since_id_part + $query_strategy_part ORDER BY $order_by LIMIT 1"; + + if ($_REQUEST["debug"]) { + print $query; + } + + $result = db_query($query); + if ($result) { + $current_top_id = db_fetch_result($result, 0, "id"); + + if ($current_top_id != $check_top_id) { + // top changed, bail out + + return array(false, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + } + } + } + $query = "SELECT DISTINCT date_entered, guid, -- cgit v1.2.3-54-g00ecf From 34440201006344012ed01e37f883f2f0c11fcba7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 12:01:34 +0300 Subject: report top id changed in headlines buffer --- classes/api.php | 110 +++++++++++++++++++++++++------------------------ classes/feeds.php | 27 +++++++----- include/functions2.php | 2 +- js/viewfeed.js | 21 ++++++++-- 4 files changed, 90 insertions(+), 70 deletions(-) (limited to 'include') diff --git a/classes/api.php b/classes/api.php index 1a52c9257..30bde1ffe 100644 --- a/classes/api.php +++ b/classes/api.php @@ -681,47 +681,48 @@ class API extends Handler { $qfh_ret = queryFeedHeadlines($params); - $result = $qfh_ret[0]; + $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; $headlines = array(); - while ($line = db_fetch_assoc($result)) { - $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length); - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { - $line = $p->hook_query_headlines($line, $excerpt_length, true); - } - - $is_updated = ($line["last_read"] == "" && - ($line["unread"] != "t" && $line["unread"] != "1")); + if (is_resource($result)) { + while ($line = db_fetch_assoc($result)) { + $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { + $line = $p->hook_query_headlines($line, $excerpt_length, true); + } - $tags = explode(",", $line["tag_cache"]); + $is_updated = ($line["last_read"] == "" && + ($line["unread"] != "t" && $line["unread"] != "1")); - $label_cache = $line["label_cache"]; - $labels = false; + $tags = explode(",", $line["tag_cache"]); - if ($label_cache) { - $label_cache = json_decode($label_cache, true); + $label_cache = $line["label_cache"]; + $labels = false; if ($label_cache) { - if ($label_cache["no-labels"] == 1) - $labels = array(); - else - $labels = $label_cache; + $label_cache = json_decode($label_cache, true); + + if ($label_cache) { + if ($label_cache["no-labels"] == 1) + $labels = array(); + else + $labels = $label_cache; + } } - } - if (!is_array($labels)) $labels = get_article_labels($line["id"]); + if (!is_array($labels)) $labels = get_article_labels($line["id"]); - //if (!$tags) $tags = get_article_tags($line["id"]); - //if (!$labels) $labels = get_article_labels($line["id"]); + //if (!$tags) $tags = get_article_tags($line["id"]); + //if (!$labels) $labels = get_article_labels($line["id"]); - $headline_row = array( + $headline_row = array( "id" => (int)$line["id"], "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), "published" => sql_bool_to_bool($line["published"]), - "updated" => (int) strtotime($line["updated"]), + "updated" => (int)strtotime($line["updated"]), "is_updated" => $is_updated, "title" => $line["title"], "link" => $line["link"], @@ -729,49 +730,50 @@ class API extends Handler { "tags" => $tags, ); - if ($include_attachments) - $headline_row['attachments'] = get_article_enclosures( - $line['id']); + if ($include_attachments) + $headline_row['attachments'] = get_article_enclosures( + $line['id']); - if ($show_excerpt) - $headline_row["excerpt"] = $line["content_preview"]; + if ($show_excerpt) + $headline_row["excerpt"] = $line["content_preview"]; - if ($show_content) { + if ($show_content) { - if ($sanitize_content) { - $headline_row["content"] = sanitize( - $line["content"], - sql_bool_to_bool($line['hide_images']), - false, $line["site_url"], false, $line["id"]); - } else { - $headline_row["content"] = $line["content"]; + if ($sanitize_content) { + $headline_row["content"] = sanitize( + $line["content"], + sql_bool_to_bool($line['hide_images']), + false, $line["site_url"], false, $line["id"]); + } else { + $headline_row["content"] = $line["content"]; + } } - } - // unify label output to ease parsing - if ($labels["no-labels"] == 1) $labels = array(); + // unify label output to ease parsing + if ($labels["no-labels"] == 1) $labels = array(); - $headline_row["labels"] = $labels; + $headline_row["labels"] = $labels; - $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : - $feed_title; + $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : + $feed_title; - $headline_row["comments_count"] = (int)$line["num_comments"]; - $headline_row["comments_link"] = $line["comments"]; + $headline_row["comments_count"] = (int)$line["num_comments"]; + $headline_row["comments_link"] = $line["comments"]; - $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); + $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); - $headline_row["author"] = $line["author"]; + $headline_row["author"] = $line["author"]; - $headline_row["score"] = (int)$line["score"]; - $headline_row["note"] = $line["note"]; - $headline_row["lang"] = $line["lang"]; + $headline_row["score"] = (int)$line["score"]; + $headline_row["note"] = $line["note"]; + $headline_row["lang"] = $line["lang"]; - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { - $headline_row = $p->hook_render_article_api(array("headline" => $headline_row)); - } + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { + $headline_row = $p->hook_render_article_api(array("headline" => $headline_row)); + } - array_push($headlines, $headline_row); + array_push($headlines, $headline_row); + } } return $headlines; diff --git a/classes/feeds.php b/classes/feeds.php index 15b3f068c..d1caf3c25 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -295,7 +295,7 @@ class Feeds extends Handler_Protected { } } - if ($this->dbh->num_rows($result) > 0) { + if (is_resource($result) && $this->dbh->num_rows($result) > 0) { $lnum = $offset; @@ -753,7 +753,7 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info); - } else { + } else if (is_resource($result)) { $message = ""; switch ($view_mode) { @@ -799,6 +799,9 @@ class Feeds extends Handler_Protected { } $reply['content'] .= "

"; } + } else if (is_numeric($result) && $result == -1) { + $reply['content'] = ''; + $reply['top_id_changed'] = true; } if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info); @@ -884,13 +887,6 @@ class Feeds extends Handler_Protected { $reply['headlines'] = array(); - if (!$next_unread_feed) - $reply['headlines']['id'] = $feed; - else - $reply['headlines']['id'] = $next_unread_feed; - - $reply['headlines']['is_cat'] = (bool) $cat_view; - $override_order = false; switch ($order_by) { @@ -917,8 +913,17 @@ class Feeds extends Handler_Protected { $disable_cache = $ret[3]; $vgroup_last_feed = $ret[4]; - $reply['headlines']['content'] =& $ret[5]['content']; - $reply['headlines']['toolbar'] =& $ret[5]['toolbar']; + //$reply['headlines']['content'] =& $ret[5]['content']; + //$reply['headlines']['toolbar'] =& $ret[5]['toolbar']; + + $reply['headlines'] =& $ret[5]; + + if (!$next_unread_feed) + $reply['headlines']['id'] = $feed; + else + $reply['headlines']['id'] = $next_unread_feed; + + $reply['headlines']['is_cat'] = (bool) $cat_view; if ($_REQUEST["debug"]) $timing_info = print_checkpoint("05", $timing_info); diff --git a/include/functions2.php b/include/functions2.php index e4e66acd1..31504a38b 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -761,7 +761,7 @@ if ($current_top_id != $check_top_id) { // top changed, bail out - return array(false, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); } } } diff --git a/js/viewfeed.js b/js/viewfeed.js index 8bc42aadc..b4bf69a7e 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -184,10 +184,22 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } else { console.log("no new headlines received"); + var top_id_changed = reply['headlines']['top_id_changed']; + console.log("top id changed:" + top_id_changed); + var hsp = $("headlines-spacer"); - if (hsp) hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; + if (hsp) { + if (top_id_changed) { + hsp.innerHTML = "" + + __("New articles found, reload feed to continue.") + ""; + } else { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; + } + + } + } } @@ -1325,13 +1337,14 @@ function headlines_scroll_handler(e) { return; } - } else { - if (hsp) + /*} else { + if (hsp) { if (_infscroll_disable) hsp.innerHTML = "" + __("Click to open next unread feed.") + ""; else hsp.innerHTML = ""; + }*/ } if (isCdmMode()) { -- cgit v1.2.3-54-g00ecf From 83ce77a2e8fbffc4c179f190dbc5d97f459a01f7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 14:07:38 +0300 Subject: functions: fix some phpstorm-reported warnings --- include/functions2.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index 31504a38b..282571850 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -447,6 +447,8 @@ $check_top_id = isset($params["check_top_id"]) ? $params["check_top_id"] : false; $ext_tables_part = ""; + $query_strategy_part = ""; + $search_words = array(); if ($search) { @@ -1194,7 +1196,7 @@ $_SESSION["hasMp3"])) { $entry .= ""; } else { @@ -1619,6 +1621,7 @@ return __("no tags"); } else { $maxtags = min(5, count($tags)); + $tags_str = ""; for ($i = 0; $i < $maxtags; $i++) { $tags_str .= "" . $tags[$i] . ", "; -- cgit v1.2.3-54-g00ecf From 48fefe2f6b6e625b64b0c6d54e35e3608e70a1bd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 17:55:35 +0300 Subject: fixes for first_id stuff --- classes/api.php | 12 +++++++----- classes/feeds.php | 11 ++++++----- include/functions2.php | 53 +++++++++++++++++++++++--------------------------- js/feedlist.js | 6 ++---- js/viewfeed.js | 8 +++++--- 5 files changed, 44 insertions(+), 46 deletions(-) (limited to 'include') diff --git a/classes/api.php b/classes/api.php index 648d6ca6e..08c1846d2 100644 --- a/classes/api.php +++ b/classes/api.php @@ -205,7 +205,7 @@ class API extends Handler { $force_update = sql_bool_to_bool($_REQUEST["force_update"]); $has_sandbox = sql_bool_to_bool($_REQUEST["has_sandbox"]); $excerpt_length = (int)$this->dbh->escape_string($_REQUEST["excerpt_length"]); - $check_top_id = (int)$this->dbh->escape_string($_REQUEST["check_top_id"]); + $check_first_id = (int)$this->dbh->escape_string($_REQUEST["check_first_id"]); $include_header = sql_bool_to_bool($_REQUEST["include_header"]); $_SESSION['hasSandbox'] = $has_sandbox; @@ -230,7 +230,7 @@ class API extends Handler { list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, - $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_top_id); + $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id); if ($include_header) { $this->wrap(self::STATUS_OK, array($headlines_header, $headlines)); @@ -644,7 +644,7 @@ class API extends Handler { $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, $search = "", $include_nested = false, $sanitize_content = true, - $force_update = false, $excerpt_length = 100, $check_top_id = false) { + $force_update = false, $excerpt_length = 100, $check_first_id = false) { if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { // Update the feed if required with some basic flood control @@ -686,18 +686,20 @@ class API extends Handler { "offset" => $offset, "since_id" => $since_id, "include_children" => $include_nested, - "check_top_id" => $check_top_id + "check_first_id" => $check_first_id ); $qfh_ret = queryFeedHeadlines($params); $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; + $first_id = $qfh_ret[6]; $headlines = array(); $headlines_header = array( 'id' => $feed_id, + 'first_id' => $first_id, 'is_cat' => $is_cat); if (!is_numeric($result)) { @@ -789,7 +791,7 @@ class API extends Handler { array_push($headlines, $headline_row); } } else if (is_numeric($result) && $result == -1) { - $headlines_header['top_id_changed'] = true; + $headlines_header['first_id_changed'] = true; } return array($headlines, $headlines_header); diff --git a/classes/feeds.php b/classes/feeds.php index 508ad988a..9608290ca 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -148,7 +148,7 @@ class Feeds extends Handler_Protected { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false, $include_children = false, $check_top_id = false) { + $override_order = false, $include_children = false, $check_first_id = false) { $disable_cache = false; @@ -250,7 +250,7 @@ class Feeds extends Handler_Protected { "override_order" => $override_order, "offset" => $offset, "include_children" => $include_children, - "check_top_id" => $check_top_id + "check_first_id" => $check_first_id ); $qfh_ret = queryFeedHeadlines($params); @@ -267,6 +267,7 @@ class Feeds extends Handler_Protected { $last_updated = strpos($qfh_ret[4], '1970-') === FALSE ? make_local_datetime($qfh_ret[4], false) : __("Never"); $highlight_words = $qfh_ret[5]; + $reply['first_id'] = $qfh_ret[6]; $vgroup_last_feed = $vgr_last_feed; @@ -801,7 +802,7 @@ class Feeds extends Handler_Protected { } } else if (is_numeric($result) && $result == -1) { $reply['content'] = ''; - $reply['top_id_changed'] = true; + $reply['first_id_changed'] = true; } if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info); @@ -832,7 +833,7 @@ class Feeds extends Handler_Protected { @$offset = $this->dbh->escape_string($_REQUEST["skip"]); @$vgroup_last_feed = $this->dbh->escape_string($_REQUEST["vgrlf"]); $order_by = $this->dbh->escape_string($_REQUEST["order_by"]); - $check_top_id = $this->dbh->escape_string($_REQUEST["topid"]); + $check_first_id = $this->dbh->escape_string($_REQUEST["fid"]); if (is_numeric($feed)) $feed = (int) $feed; @@ -905,7 +906,7 @@ class Feeds extends Handler_Protected { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order, true, $check_top_id); + $vgroup_last_feed, $override_order, true, $check_first_id); //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; diff --git a/include/functions2.php b/include/functions2.php index 282571850..a85c49ccf 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -444,7 +444,7 @@ $override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false; $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false; $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false; - $check_top_id = isset($params["check_top_id"]) ? $params["check_top_id"] : false; + $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false; $ext_tables_part = ""; $query_strategy_part = ""; @@ -729,28 +729,26 @@ $start_ts_query_part = ""; } - + $first_id = false; // if previous topmost article id changed that means our current pagination is no longer valid - if ($check_top_id) { - $query = "SELECT DISTINCT - date_entered, - guid, - ttrss_entries.id, - ttrss_entries.title, - updated, - score - FROM - $from_qpart - WHERE - $feed_check_qpart - ttrss_user_entries.ref_id = ttrss_entries.id AND - ttrss_user_entries.owner_uid = '$owner_uid' AND - $search_query_part - $start_ts_query_part - $filter_query_part - $view_query_part - $since_id_part - $query_strategy_part ORDER BY $order_by LIMIT 1"; + $query = "SELECT DISTINCT + date_entered, + guid, + ttrss_entries.id, + ttrss_entries.title, + updated, + score + FROM + $from_qpart + WHERE + $feed_check_qpart + ttrss_user_entries.ref_id = ttrss_entries.id AND + ttrss_user_entries.owner_uid = '$owner_uid' AND + $search_query_part + $start_ts_query_part + $filter_query_part + $since_id_part + $query_strategy_part ORDER BY $order_by LIMIT 1"; if ($_REQUEST["debug"]) { print $query; @@ -758,15 +756,12 @@ $result = db_query($query); if ($result) { - $current_top_id = db_fetch_result($result, 0, "id"); + $first_id = (int) db_fetch_result($result, 0, "id"); - if ($current_top_id != $check_top_id) { - // top changed, bail out - - return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + if ($offset > 0 && $check_first_id && $first_id != $check_first_id) { + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } } - } $query = "SELECT DISTINCT date_entered, @@ -851,7 +846,7 @@ $result = db_query($query); } - return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words); + return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } diff --git a/js/feedlist.js b/js/feedlist.js index 54ad1cc50..0bfb6b6a7 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -100,10 +100,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_w } if (offset > 0) { - var firstRow = $$('div[id*="RROW-"]').first(); - - if (firstRow) { - query = query + "&topid=" + param_escape(parseInt(firstRow.id.replace("RROW-", ""))); + if (current_first_id) { + query = query + "&fid=" + param_escape(current_first_id); } } diff --git a/js/viewfeed.js b/js/viewfeed.js index 3fc616058..1a45e8bb5 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -13,6 +13,7 @@ var catchup_timeout_id = false; var cids_requested = []; var loaded_article_ids = []; var _last_headlines_update = 0; +var current_first_id = 0; var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; @@ -77,6 +78,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { _infscroll_disable = 0; } + current_first_id = reply['headlines']['first_id']; var counters = reply['counters']; var articles = reply['articles']; //var runtime_info = reply['runtime-info']; @@ -183,13 +185,13 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } else { console.log("no new headlines received"); - var top_id_changed = reply['headlines']['top_id_changed']; - console.log("top id changed:" + top_id_changed); + var first_id_changed = reply['headlines']['first_id_changed']; + console.log("first id changed:" + first_id_changed); var hsp = $("headlines-spacer"); if (hsp) { - if (top_id_changed) { + if (first_id_changed) { hsp.innerHTML = "" + __("New articles found, reload feed to continue.") + ""; } else { -- cgit v1.2.3-54-g00ecf From d5e0486e0cd10503df3f249e8c12760d960e5b63 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 18:47:06 +0300 Subject: minor first_id query fix --- include/functions2.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index a85c49ccf..141c6d1cd 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -732,6 +732,7 @@ $first_id = false; // if previous topmost article id changed that means our current pagination is no longer valid $query = "SELECT DISTINCT + ttrss_feeds.title, date_entered, guid, ttrss_entries.id, -- cgit v1.2.3-54-g00ecf From 8831632905398e5cfe2c3d071a5feaf8ac05d48b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 22:50:21 +0300 Subject: add some more stuff to first_id query to fix virtual feeds --- include/functions2.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index 141c6d1cd..11274b713 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -738,7 +738,11 @@ ttrss_entries.id, ttrss_entries.title, updated, - score + score, + marked, + published, + last_marked, + last_published FROM $from_qpart WHERE -- cgit v1.2.3-54-g00ecf From f7fd1edb76fcb3b56ef4d327f8851484e782a1f8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 22:54:55 +0300 Subject: first_id default value: type is important --- include/functions2.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index 11274b713..459a2a533 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -729,7 +729,7 @@ $start_ts_query_part = ""; } - $first_id = false; + $first_id = 0; // if previous topmost article id changed that means our current pagination is no longer valid $query = "SELECT DISTINCT ttrss_feeds.title, @@ -760,10 +760,10 @@ } $result = db_query($query); - if ($result) { + if ($result && db_num_rows($result) > 0) { $first_id = (int) db_fetch_result($result, 0, "id"); - if ($offset > 0 && $check_first_id && $first_id != $check_first_id) { + if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) { return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } } -- cgit v1.2.3-54-g00ecf From f56e5a35041878b5ec827e96ce3ac78a0df944c8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Jul 2015 00:40:15 +0300 Subject: add workaround for fresh feed first id calculation issue --- include/functions2.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index 459a2a533..e0b9e24ad 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -730,6 +730,11 @@ } $first_id = 0; + $first_id_query_strategy_part = $query_strategy_part; + + if ($feed == -3) + $first_id_query_strategy_part = "true"; + // if previous topmost article id changed that means our current pagination is no longer valid $query = "SELECT DISTINCT ttrss_feeds.title, @@ -753,7 +758,7 @@ $start_ts_query_part $filter_query_part $since_id_part - $query_strategy_part ORDER BY $order_by LIMIT 1"; + $first_id_query_strategy_part ORDER BY $order_by LIMIT 1"; if ($_REQUEST["debug"]) { print $query; -- cgit v1.2.3-54-g00ecf From 0e4da73f06a2d30ecd02b185d21671ed44737631 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Jul 2015 01:22:44 +0300 Subject: do not allow commas in tags --- include/functions2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions2.php b/include/functions2.php index e0b9e24ad..2c3133883 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1483,7 +1483,7 @@ $tag = mb_strtolower($tag, 'utf-8'); - $tag = preg_replace('/[\'\"\+\>\<]/', "", $tag); + $tag = preg_replace('/[,\'\"\+\>\<]/', "", $tag); if (DB_TYPE == "mysql") { $tag = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $tag); -- cgit v1.2.3-54-g00ecf