Add brief mode of JSON generation for blerglatest

[blerg.git] / cgi / cgi_blerg.c

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 5cd59a8..9974513 100644 (file)
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -1,3 +1,6 @@
+/* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a
+ * BSD-style license.  Please see the COPYING file for details.
+ */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -6,40 +9,12 @@
 #include "database.h"
 #include "tags.h"
 #include "auth.h"
+#include "canned_responses.h"
 #include "app.h"
 #include "config.h"
 
 yajl_gen_config yajl_c = { 0, 0 };
 
-void respond_simple_data(unsigned const char *data, int len) {
-       printf("Content-length: %d\r\n\r\n", len);
-       write(0, data, len);
-}
-
-void respond_404() {
-       printf("Status: 404 Not Found\r\n");
-       printf("Content-type: text/html\r\n");
-       printf("Content-length: %d\r\n\r\n", strlen(CONTENT_404));
-
-       printf(CONTENT_404);
-}
-
-void respond_405() {
-       printf("Status: 405 Method Not Allowed\r\n");
-       printf("Content-type: text/html\r\n");
-       printf("Content-length: %d\r\n\r\n", strlen(CONTENT_405));
-
-       printf(CONTENT_405);
-}
-
-void respond_JSON_Failure() {
-       respond_simple_data(JSON_FAILURE, strlen(JSON_FAILURE));
-}
-
-void respond_JSON_Success() {
-       respond_simple_data(JSON_SUCCESS, strlen(JSON_SUCCESS));
-}
-
 void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
        const unsigned char *ybuf;
        unsigned int len;
@@ -58,15 +33,15 @@ void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
        yajl_gen_array_open(g);
 
        for (i = to; i != from - 1; i--) {
-               json_generate_one_record(g, NULL, b, i);
+               json_generate_one_record(g, NULL, b, i, 0);
                yajl_gen_get_buf(g, &ybuf, &len);
-               write(0, ybuf, len);
+               fwrite(ybuf, len, 1, stdout);
                yajl_gen_clear(g);
        }
 
        yajl_gen_array_close(g);
        yajl_gen_get_buf(g, &ybuf, &len);
-       write(0, ybuf, len);
+       fwrite(ybuf, len, 1, stdout);
        yajl_gen_free(g);
 }
 
@@ -86,11 +61,11 @@ void respond_taglist(struct tag *results, int i) {
        while (i >= 0) {
                b = blerg_open(results[i].author);
                if (b != NULL) {
-                       json_generate_one_record(g, results[i].author, b, results[i].record);
+                       json_generate_one_record(g, results[i].author, b, results[i].record, 0);
                        blerg_close(b);
                }
                yajl_gen_get_buf(g, &ybuf, &len);
-               write(0, ybuf, len);
+               fwrite(ybuf, len, 1, stdout);
                yajl_gen_clear(g);
 
                i--;
@@ -98,7 +73,7 @@ void respond_taglist(struct tag *results, int i) {
 
        yajl_gen_array_close(g);
        yajl_gen_get_buf(g, &ybuf, &len);
-       write(0, ybuf, len);
+       fwrite(ybuf, len, 1, stdout);
        yajl_gen_free(g);
 }
 
@@ -118,6 +93,10 @@ int main(int argc, char *argv[]) {
                exit(0);
        }
        request_method = getenv("REQUEST_METHOD");
+       if (request_method == NULL) {
+               fprintf(stderr, "Request method is null!?\n");
+               exit(0);
+       }
 
        if (strncmp(path, "/get", 4) == 0 && strlen(path) > 4) {
                if (strncmp(request_method, "GET", 4) != 0) {
@@ -183,6 +162,8 @@ int main(int argc, char *argv[]) {
                        exit(0);
                }
 
+               if (info.author[0] == 'H')
+                       info.author[0] = '#';
                if (!tag_exists(info.author)) {
                        respond_404();
                        exit(0);
@@ -273,7 +254,7 @@ int main(int argc, char *argv[]) {
 
                printf("Content-type: application/json\r\n");
                printf("Content-length: %d\r\n\r\n", len);
-               write(0, ybuf, len);
+               fwrite(ybuf, len, 1, stdout);
 
                yajl_gen_free(g);
        } else if (strncmp(path, "/create", 8) == 0) {