projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add BLERG_HOME to env vars
[blerg.git]
/
common
/
json.c
diff --git
a/common/json.c
b/common/json.c
index
6b793ab
..
833c968
100644
(file)
--- a/
common/json.c
+++ b/
common/json.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>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@
-5,7
+8,7
@@
#include "database.h"
#include "json.h"
#include "database.h"
#include "json.h"
-void json_generate_one_record(yajl_gen g, const char *author, struct blerg *b, uint64_t record) {
+void json_generate_one_record(yajl_gen g, const char *author, struct blerg *b, uint64_t record
, int brief
) {
char *data;
char number[21];
int len;
char *data;
char number[21];
int len;
@@
-15,18
+18,28
@@
void json_generate_one_record(yajl_gen g, const char *author, struct blerg *b, u
return;
}
return;
}
+ if (brief && len > 150) {
+ len = 150;
+ /* This is a bit of a hackish way to add an ellipsis, and will
+ * probably cause weird results if we overwrite part of a UTF-8
+ * char */
+ data[149] = '.';
+ data[148] = '.';
+ data[147] = '.';
+ }
+
yajl_gen_map_open(g);
if (author != NULL) {
yajl_gen_map_open(g);
if (author != NULL) {
- yajl_gen_string(g, "author", 6);
- yajl_gen_string(g, author, strlen(author));
+ yajl_gen_string(g,
(unsigned char *)
"author", 6);
+ yajl_gen_string(g,
(unsigned char *)
author, strlen(author));
}
}
- yajl_gen_string(g, "record", 6);
+ yajl_gen_string(g,
(unsigned char *)
"record", 6);
snprintf(number, 21, "%llu", record);
snprintf(number, 21, "%llu", record);
- yajl_gen_string(g, number, strlen(number));
- yajl_gen_string(g, "timestamp", 9);
+ yajl_gen_string(g,
(unsigned char *)
number, strlen(number));
+ yajl_gen_string(g,
(unsigned char *)
"timestamp", 9);
yajl_gen_integer(g, blerg_get_timestamp(b, record));
yajl_gen_integer(g, blerg_get_timestamp(b, record));
- yajl_gen_string(g, "data", 4);
- yajl_gen_string(g, data, len);
+ yajl_gen_string(g,
(unsigned char *)
"data", 4);
+ yajl_gen_string(g,
(unsigned char *)
data, len);
yajl_gen_map_close(g);
free(data);
yajl_gen_map_close(g);
free(data);