api: implement pagination for getHeadlines; misc tweaks

This commit is contained in:
Andrew Dolgov 2009-12-21 19:36:40 +03:00
parent 4d315f54fe
commit 285f759755
1 changed files with 12 additions and 1 deletions

View File

@ -88,6 +88,11 @@
} else { } else {
print json_encode(array("unread" => getGlobalUnread($link))); print json_encode(array("unread" => getGlobalUnread($link)));
} }
break;
case "getCounters":
/* TODO */
break; break;
case "getFeeds": case "getFeeds":
$cat_id = db_escape_string($_REQUEST["cat_id"]); $cat_id = db_escape_string($_REQUEST["cat_id"]);
@ -122,6 +127,9 @@
$unread = getFeedUnread($link, $line["id"]); $unread = getFeedUnread($link, $line["id"]);
$icon_path = "../" . ICONS_DIR . "/" . $line["id"] . ".ico";
$has_icon = file_exists($icon_path) && filesize($icon_path) > 0;
if ($unread || !$unread_only) { if ($unread || !$unread_only) {
$row = array( $row = array(
@ -129,6 +137,7 @@
"title" => $line["title"], "title" => $line["title"],
"id" => (int)$line["id"], "id" => (int)$line["id"],
"unread" => (int)$unread, "unread" => (int)$unread,
"has_icon" => $has_icon,
"cat_id" => (int)$line["cat_id"], "cat_id" => (int)$line["cat_id"],
"last_updated" => strtotime($line["last_updated"]) "last_updated" => strtotime($line["last_updated"])
); );
@ -209,6 +218,7 @@
case "getHeadlines": case "getHeadlines":
$feed_id = db_escape_string($_REQUEST["feed_id"]); $feed_id = db_escape_string($_REQUEST["feed_id"]);
$limit = (int)db_escape_string($_REQUEST["limit"]); $limit = (int)db_escape_string($_REQUEST["limit"]);
$offset = (int)db_escape_string($_REQUEST["skip"]);
$filter = db_escape_string($_REQUEST["filter"]); $filter = db_escape_string($_REQUEST["filter"]);
$is_cat = (bool)db_escape_string($_REQUEST["is_cat"]); $is_cat = (bool)db_escape_string($_REQUEST["is_cat"]);
$show_excerpt = (bool)db_escape_string($_REQUEST["show_excerpt"]); $show_excerpt = (bool)db_escape_string($_REQUEST["show_excerpt"]);
@ -221,7 +231,8 @@
$match_on = db_escape_string($_REQUEST["match_on"]); $match_on = db_escape_string($_REQUEST["match_on"]);
$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
$view_mode, $is_cat, $search, $search_mode, $match_on); $view_mode, $is_cat, $search, $search_mode, $match_on,
false, $offset);
$result = $qfh_ret[0]; $result = $qfh_ret[0];
$feed_title = $qfh_ret[1]; $feed_title = $qfh_ret[1];