X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=http_blerg.c;h=d46313c3b2f7ef8e40ca0a5e2313087523b8fcf6;hb=fff174451c104dd5dab4517a71b660263ffd8b4e;hp=0bf237b931a313720f7e40f69d06c6ec17570b16;hpb=1bce37f32d8cfc9441b35f40fd0070163b0e945d;p=blerg.git
diff --git a/http_blerg.c b/http_blerg.c
index 0bf237b..d46313c 100644
--- a/http_blerg.c
+++ b/http_blerg.c
@@ -6,6 +6,8 @@
#include "database.h"
#include "tags.h"
#include "auth.h"
+#include "canned_responses.h"
+#include "http.h"
#include "config.h"
#define URL_INFO_AUTHOR 0x1
@@ -28,56 +30,11 @@ struct get_state {
struct blerg *b;
yajl_gen g;
unsigned int yoff;
- uint64_t from;
- uint64_t to;
+ uint64_t *entries;
+ uint64_t i;
int done;
};
-struct MHD_Response *response_401;
-struct MHD_Response *response_404;
-struct MHD_Response *response_405;
-struct MHD_Response *response_JSON_Success;
-struct MHD_Response *response_JSON_Failure;
-
-void init_responses() {
-#define CONTENT_401 "
401 Unauthorized401 Unauthorized
DENIED"
- response_401 = MHD_create_response_from_data(strlen (CONTENT_401), CONTENT_401, MHD_NO, MHD_NO);
-
-#define CONTENT_404 "404 Not Found404 Not Found
I couldn't find that."
- response_404 = MHD_create_response_from_data(strlen(CONTENT_404), CONTENT_404, MHD_NO, MHD_NO);
-
-#define CONTENT_405 "405 Method Not Allowed405 Method Not Allowed
I'm sorry, Dave. I'm afraid I can't do that."
- response_405 = MHD_create_response_from_data(strlen(CONTENT_405), CONTENT_405, MHD_NO, MHD_NO);
-
-#define JSON_SUCCESS "{status: \"success\"}"
- response_JSON_Success = MHD_create_response_from_data(strlen(JSON_SUCCESS), JSON_SUCCESS, MHD_NO, MHD_NO);
-
-#define JSON_FAILURE "{status: \"failure\"}"
- response_JSON_Failure = MHD_create_response_from_data(strlen(JSON_FAILURE), JSON_FAILURE, MHD_NO, MHD_NO);
-}
-
-#define REALM "Blerg"
-#define OPAQUE "d29fb6db8f21a6e99903651a9f87470e"
-int respond_401(struct MHD_Connection *connection, int signal_stale) {
- return MHD_queue_auth_fail_response(connection, REALM, OPAQUE, response_401, signal_stale);
-}
-
-int respond_404(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, response_404);
-}
-
-int respond_405(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_METHOD_NOT_ALLOWED, response_405);
-}
-
-int respond_JSON_Success(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_OK, response_JSON_Success);
-}
-
-int respond_JSON_Failure(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_OK, response_JSON_Failure);
-}
-
int parse_url_info(const char *url, char *author, uint64_t *record) {
const char *c;
int ret = 0;
@@ -103,10 +60,23 @@ int parse_url_info(const char *url, char *author, uint64_t *record) {
return ret;
}
+uint64_t *make_sequential_list(uint64_t from, uint64_t to) {
+ uint64_t len = to - from + 1;
+ uint64_t *list = malloc(len * sizeof(uint64_t));
+ uint64_t i;
+
+ for (i = 0; i < len; i++) {
+ list[i] = from + i;
+ }
+
+ return list;
+}
+
ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
struct get_state *gs = cls;
const unsigned char *ybuf;
char *data;
+ char number[21];
unsigned int len;
if (gs->yoff > 0) {
@@ -128,28 +98,20 @@ ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
return -1;
if (pos == 0) { /* Start iterating */
- gs->yoff = 0;
- yajl_gen_array_open(gs->g);
- uint64_t record_count = blerg_get_record_count(gs->b);
- if (record_count == 0) {
- gs->from = 1;
- gs->to = 0;
- } else {
- gs->to = record_count - 1;
- gs->from = (record_count > 50 ? gs->to - 49 : 0);
- }
+ yajl_gen_map_open(gs->g);
}
- if (gs->from > gs->to) { /* Done iterating */
- yajl_gen_array_close(gs->g);
+ /* Snarf one record */
+ blerg_fetch(gs->b, gs->entries[gs->i], &data, &len);
+ snprintf(number, 21, "%llu", gs->entries[gs->i]);
+ yajl_gen_string(gs->g, number, strlen(number));
+ yajl_gen_string(gs->g, data, len);
+ free(data);
+ if (gs->i == 0) {
+ yajl_gen_map_close(gs->g);
gs->done = 1;
- } else {
- /* Snarf one record */
- blerg_fetch(gs->b, gs->from, &data, &len);
- yajl_gen_string(gs->g, data, len);
- free(data);
- gs->from++;
}
+ gs->i--;
yajl_gen_get_buf(gs->g, &ybuf, &len);
@@ -169,6 +131,7 @@ void GET_generate_list_free(void *cls) {
blerg_close(gs->b);
yajl_gen_free(gs->g);
+ free(gs->entries);
free(gs);
}
@@ -254,16 +217,27 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
MHD_destroy_response(response);
return ret;
} else {
- yajl_gen_config c;
- c.beautify = 0;
-
struct get_state *gs = malloc(sizeof(struct get_state));
gs->b = blerg_open(author);
- gs->g = yajl_gen_alloc(&c, NULL);
- gs->yoff = 0;
- gs->done = 0;
+ uint64_t record_count = blerg_get_record_count(gs->b);
+ if (record_count == 0) {
+ response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO);
+ } else {
+ uint64_t from, to, i, j;
+ to = record_count - 1;
+ from = (record_count > 50 ? to - 49 : 0);
+ gs->entries = make_sequential_list(from, to);
+ gs->i = to - from;
+
+ yajl_gen_config c;
+ c.beautify = 0;
+
+ gs->g = yajl_gen_alloc(&c, NULL);
+ gs->yoff = gs->done = 0;
+
+ response = MHD_create_response_from_callback(-1, 262144, &GET_generate_list, gs, &GET_generate_list_free);
+ }
- response = MHD_create_response_from_callback(-1, 262144, &GET_generate_list, gs, &GET_generate_list_free);
ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
MHD_destroy_response(response);