projects
/
prss.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[prss.git]
/
src
/
ttrss_ws.c
diff --git
a/src/ttrss_ws.c
b/src/ttrss_ws.c
index
3aa4959
..
d2c673f
100644
(file)
--- a/
src/ttrss_ws.c
+++ b/
src/ttrss_ws.c
@@
-47,6
+47,11
@@
void ws_request_add_att_int(json_object *rq, const char *k, int v)
json_object_object_add(rq, k, json_object_new_int(v));
}
json_object_object_add(rq, k, json_object_new_int(v));
}
+void ws_request_add_att_bool(json_object *rq, const char *k, int v)
+{
+ json_object_object_add(rq, k, json_object_new_boolean(v));
+}
+
struct json_object *ws_request_new(const char *op)
{
struct json_object *rq;
struct json_object *ws_request_new(const char *op)
{
struct json_object *rq;
@@
-203,7
+208,7
@@
char *ws_login()
int ws_open_session()
{
int ws_open_session()
{
- int
/*version, */
result;
+ int
version,
result;
log_debug("ws_open_session()");
log_debug("ws_open_session()");
@@
-214,16
+219,16
@@
int ws_open_session()
session_id = ws_login();
if (session_id) {
session_id = ws_login();
if (session_id) {
-
/*
version = ws_get_api_version();
+ version = ws_get_api_version();
log_debug("API version= %d", version);
log_debug("API version= %d", version);
-
+
if (version > 0) {
result = 1;
} else {
free(session_id);
session_id = NULL;
result = 0;
if (version > 0) {
result = 1;
} else {
free(session_id);
session_id = NULL;
result = 0;
- }*/
+ }
result = 1;
} else {
result = 0;
result = 1;
} else {
result = 0;
@@
-269,6
+274,7
@@
int ws_update_headlines(struct feed *feed)
rq = ws_request_new("getHeadlines");
ws_request_add_att_int(rq, "feed_id", feed->id);
rq = ws_request_new("getHeadlines");
ws_request_add_att_int(rq, "feed_id", feed->id);
+ ws_request_add_att_bool(rq, "show_excerpt", 1);
rp = ws_execute(rq);
rp = ws_execute(rq);
@@
-292,6
+298,10
@@
int ws_update_headlines(struct feed *feed)
h = headline_new(hid, url, title);
h = headline_new(hid, url, title);
+ j = json_object_object_get(jheadline,
+ "excerpt");
+ h->excerpt = strdup(json_object_get_string(j));
+
tmp = headlines_add(feed->headlines, h);
if (feed->headlines)
free(feed->headlines);
tmp = headlines_add(feed->headlines, h);
if (feed->headlines)
free(feed->headlines);