refactoring req interface

[src/app-framework-binder.git] / plugins / afm-main-plugin / afm-main-plugin.c

diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
index fbf5b59..b026fd8 100644 (file)
--- a/plugins/afm-main-plugin/afm-main-plugin.c
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -73,7 +73,7 @@ static struct json_object *embed(const char *tag, struct json_object *obj)
 static void embed_call_void(struct afb_req request, const char *method)
 {
        struct json_object *obj = jbus_call_sj_sync(jbus, method, "true");
-       if (interface->verbose)
+       if (interface->verbosity)
                fprintf(stderr, "(afm-main-plugin) %s(true) -> %s\n", method, obj ? json_object_to_json_string(obj) : "NULL");
        if (obj == NULL) {
                afb_req_fail(request, "failed", "framework daemon failure");
@@ -91,7 +91,7 @@ static void call_appid(struct afb_req request, const char *method)
 {
        struct json_object *obj;
        char *sid;
-       const char *id = afb_req_argument(request, _id_);
+       const char *id = afb_req_value(request, _id_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'id'");
                return;
@@ -101,7 +101,7 @@ static void call_appid(struct afb_req request, const char *method)
                return;
        }
        obj = jbus_call_sj_sync(jbus, method, sid);
-       if (interface->verbose)
+       if (interface->verbosity)
                fprintf(stderr, "(afm-main-plugin) %s(%s) -> %s\n", method, sid, obj ? json_object_to_json_string(obj) : "NULL");
        free(sid);
        if (obj == NULL) {
@@ -114,13 +114,13 @@ static void call_appid(struct afb_req request, const char *method)
 static void call_runid(struct afb_req request, const char *method)
 {
        struct json_object *obj;
-       const char *id = afb_req_argument(request, _runid_);
+       const char *id = afb_req_value(request, _runid_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'runid'");
                return;
        }
        obj = jbus_call_sj_sync(jbus, method, id);
-       if (interface->verbose)
+       if (interface->verbosity)
                fprintf(stderr, "(afm-main-plugin) %s(%s) -> %s\n", method, id,
                                obj ? json_object_to_json_string(obj) : "NULL");
        if (obj == NULL) {
@@ -151,13 +151,13 @@ static void start(struct afb_req request)
        int rc;
 
        /* get the id */
-       id = afb_req_argument(request, _id_);
+       id = afb_req_value(request, _id_);
        if (id == NULL) {
                afb_req_fail(request, "bad-request", "missing 'id'");
                return;
        }
        /* get the mode */
-       mode = afb_req_argument(request, _mode_);
+       mode = afb_req_value(request, _mode_);
        if (mode == NULL || !strcmp(mode, _auto_)) {
                mode = interface->mode == AFB_MODE_REMOTE ? _remote_ : _local_;
        }
@@ -171,7 +171,7 @@ static void start(struct afb_req request)
 
        /* calls the service */
        obj = jbus_call_sj_sync(jbus, _start_, query);
-       if (interface->verbose)
+       if (interface->verbosity)
                fprintf(stderr, "(afm-main-plugin) start(%s) -> %s\n", query, obj ? json_object_to_json_string(obj) : "NULL");
        free(query);
 
@@ -221,8 +221,8 @@ static void install(struct afb_req request)
 
        /* get the argument */
        arg = afb_req_get(request, "widget");
-       filename = arg.value;
-       if (filename == NULL || !arg.is_file) {
+       filename = arg.path;
+       if (filename == NULL) {
                afb_req_fail(request, "bad-request", "missing 'widget' file");
                return;
        }
@@ -234,7 +234,7 @@ static void install(struct afb_req request)
        }
 
        obj = jbus_call_sj_sync(jbus, _install_, query);
-       if (interface->verbose)
+       if (interface->verbosity)
                fprintf(stderr, "(afm-main-plugin) install(%s) -> %s\n", query, obj ? json_object_to_json_string(obj) : "NULL");
        free(query);