projects
/
ppastats.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only save useful att for bpph
[ppastats.git]
/
src
/
lp_json.c
diff --git
a/src/lp_json.c
b/src/lp_json.c
index
a2b88f6
..
d88587a
100644
(file)
--- a/
src/lp_json.c
+++ b/
src/lp_json.c
@@
-16,10
+16,8
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
-
+#define _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE
#define _XOPEN_SOURCE
-#include <time.h>
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-37,6
+35,7
@@
static struct bpph *json_to_bpph(json_object *o)
int architecture_specific;
const char *date_created;
struct bpph *bpph;
int architecture_specific;
const char *date_created;
struct bpph *bpph;
+ const char *status;
binary_package_name = json_object_get_string
(json_object_object_get(o, "binary_package_name"));
binary_package_name = json_object_get_string
(json_object_object_get(o, "binary_package_name"));
@@
-64,10
+63,12
@@
static struct bpph *json_to_bpph(json_object *o)
date_created = json_object_get_string
(json_object_object_get(o, "date_created"));
date_created = json_object_get_string
(json_object_object_get(o, "date_created"));
- if (date_created) {
- bpph->date_created.tm_isdst = -1;
+ if (date_created)
strptime(date_created, "%FT%T%z", &bpph->date_created);
strptime(date_created, "%FT%T%z", &bpph->date_created);
- }
+
+ status = json_object_get_string(json_object_object_get(o, "status"));
+ if (status)
+ bpph->status = strdup(status);
return bpph;
}
return bpph;
}
@@
-99,6
+100,9
@@
static json_object *bpph_to_json(struct bpph *bpph)
"architecture_specific",
json_object_new_boolean(bpph->architecture_specific));
"architecture_specific",
json_object_new_boolean(bpph->architecture_specific));
+ json_object_object_add
+ (json, "status", json_object_new_string(bpph->status));
+
date = malloc(strlen("YY-MM-DDThh:mm:ss+xxx") + 1);
strftime(date,
strlen("YY-MM-DDThh:mm:ss+xxx") + 1,
date = malloc(strlen("YY-MM-DDThh:mm:ss+xxx") + 1);
strftime(date,
strlen("YY-MM-DDThh:mm:ss+xxx") + 1,
@@
-106,10
+110,7
@@
static json_object *bpph_to_json(struct bpph *bpph)
&bpph->date_created);
json_object_object_add
&bpph->date_created);
json_object_object_add
- (json,
- "date_created",
- json_object_new_string(date));
-
+ (json, "date_created", json_object_new_string(date));
free(date);
return json;
free(date);
return json;
@@
-155,14
+156,11
@@
struct distro_series *json_object_to_distro_series(json_object *o)
displayname = json_object_get_string
(json_object_object_get(o, "displayname"));
displayname = json_object_get_string
(json_object_object_get(o, "displayname"));
- title = json_object_get_string
- (json_object_object_get(o, "title"));
+ title = json_object_get_string(json_object_object_get(o, "title"));
- version = json_object_get_string
- (json_object_object_get(o, "version"));
+ version = json_object_get_string(json_object_object_get(o, "version"));
- name = json_object_get_string
- (json_object_object_get(o, "name"));
+ name = json_object_get_string(json_object_object_get(o, "name"));
return distro_series_new(name,
version,
return distro_series_new(name,
version,