projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Genericize and extend url_info
[blerg.git]
/
http
/
http_blerg.c
diff --git
a/http/http_blerg.c
b/http/http_blerg.c
index
1a751ac
..
025fbb0
100644
(file)
--- a/
http/http_blerg.c
+++ b/
http/http_blerg.c
@@
-75,7
+75,7
@@
ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
}
/* Snarf one record */
}
/* Snarf one record */
- json_generate_one_record(gs->g, NULL, gs->b, gs->entries[gs->i]);
+ json_generate_one_record(gs->g, NULL, gs->b, gs->entries[gs->i]
, 0
);
if (gs->i == 0) {
yajl_gen_array_close(gs->g);
if (gs->i == 0) {
yajl_gen_array_close(gs->g);
@@
-136,7
+136,7
@@
ssize_t GET_generate_taglist(void *cls, uint64_t pos, char *buf, size_t max) {
/* Snarf one record */
b = blerg_open(ts->results[ts->i].author);
if (b != NULL) {
/* Snarf one record */
b = blerg_open(ts->results[ts->i].author);
if (b != NULL) {
- json_generate_one_record(ts->g, ts->results[ts->i].author, b, ts->results[ts->i].record);
+ json_generate_one_record(ts->g, ts->results[ts->i].author, b, ts->results[ts->i].record
, 0
);
blerg_close(b);
}
blerg_close(b);
}
@@
-264,15
+264,15
@@
ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
return respond_404(connection);
ret = parse_url_info(url + 5, &info);
return respond_404(connection);
ret = parse_url_info(url + 5, &info);
- if ((ret & URL_INFO_
AUTHOR
) == 0)
+ if ((ret & URL_INFO_
NAME
) == 0)
return respond_404(connection);
return respond_404(connection);
- if (!blerg_exists(info.
author
))
+ if (!blerg_exists(info.
name
))
return respond_404(connection);
*ptr == NULL;
return respond_404(connection);
*ptr == NULL;
- struct blerg *b = blerg_open(info.
author
);
+ struct blerg *b = blerg_open(info.
name
);
if ((ret & URL_INFO_RECORD) && (ret & URL_INFO_RECORD_TO)) {
response = create_response_for_range(b, info.record, info.record_to);
if ((ret & URL_INFO_RECORD) && (ret & URL_INFO_RECORD_TO)) {
response = create_response_for_range(b, info.record, info.record_to);
@@
-317,14
+317,14
@@
ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
return respond_404(connection);
ret = parse_url_info(url + 5, &info);
return respond_404(connection);
ret = parse_url_info(url + 5, &info);
- if ((ret & URL_INFO_
AUTHOR
) == 0)
+ if ((ret & URL_INFO_
NAME
) == 0)
return respond_404(connection);
return respond_404(connection);
- if (!tag_exists(info.
author
))
+ if (!tag_exists(info.
name
))
return respond_404(connection);
int recs = 50;
return respond_404(connection);
int recs = 50;
- struct tag *taglist = tag_list(info.
author
, 0, &recs, -1);
+ struct tag *taglist = tag_list(info.
name
, 0, &recs, -1);
if (recs == 0) {
response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO);
if (recs == 0) {
response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO);
@@
-400,15
+400,15
@@
ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
return respond_404(connection);
ret = parse_url_info(url + 6, &info);
return respond_404(connection);
ret = parse_url_info(url + 6, &info);
- if ((ret & URL_INFO_
AUTHOR
) == 0)
+ if ((ret & URL_INFO_
NAME
) == 0)
return respond_404(connection);
return respond_404(connection);
- if (!blerg_exists(info.
author
))
+ if (!blerg_exists(info.
name
))
return respond_404(connection);
*ptr == NULL;
return respond_404(connection);
*ptr == NULL;
- struct blerg *b = blerg_open(info.
author
);
+ struct blerg *b = blerg_open(info.
name
);
uint64_t record_count = blerg_get_record_count(b);
blerg_close(b);
uint64_t record_count = blerg_get_record_count(b);
blerg_close(b);
@@
-548,7
+548,7
@@
int main(int argc, char *argv[]) {
init_responses();
init_responses();
- daemon = MHD_start_daemon(MHD_USE_DEBUG,
8080
, NULL, NULL, &ahc_derp, NULL, MHD_OPTION_END);
+ daemon = MHD_start_daemon(MHD_USE_DEBUG,
HTTP_BLERG_PORT
, NULL, NULL, &ahc_derp, NULL, MHD_OPTION_END);
if (daemon == NULL) {
fprintf(stderr, "Could not start web server\n");
return 1;
if (daemon == NULL) {
fprintf(stderr, "Could not start web server\n");
return 1;