Changeset 5810

Timestamp:

03/13/10 19:13:36 (3 years ago)

Author:

blogic

Message:

basic commit functions. validation and datasource access is still missing

Location:

luci2/cbi2

Files:

• apps/language.luci (modified) (1 diff)
• cbi.h (modified) (1 diff)
• json.c (modified) (11 diffs)
• json.h (modified) (1 diff)
• lucic.c (modified) (1 diff)
• test.sh (modified) (1 diff)

luci2/cbi2/apps/language.luci

@@ -2 +2 @@
     <luci:title>Language Selection</luci:title>
     Please choose your language
-    <luci:section src="luci">
+    <luci:section src="luci" id="lang">
         <luci:option src="lang">Language</luci:option>
     </luci:section>

luci2/cbi2/cbi.h

@@ -3 +3 @@
 
 #include <string.h>
+#define __STRICT_ANSI__
 #include <json.h>
+#undef __STRICT_ANSI__
 #include "list.h"
 #include "uvl.h"

luci2/cbi2/json.c

@@ -4 +4 @@
 #include "session.h"
 
-static json_object* json_req_element(struct cbi_ctx *ctx, struct cbi_element *e, json_object *q)
+static json_object* json_req_element(struct cbi_ctx *ctx, struct cbi_element *e, json_object *q, int depth)
 {
     struct list_head *p;
@@ -44 +44 @@
             struct cbi_element *e2 = container_of(p, struct cbi_element, list);
             if((CAPS(e2) & CAP_TEMPLATE) == 0)
-                json_req_element(ctx, e2, sub);
+                json_req_element(ctx, e2, sub, depth + 1);
         }
         if(!container)
@@ -51 +51 @@
     if(!container)
     {
-        id = cbi_prop_find(e, "id");
+        if(depth == 0)
+            id = e->id;
+        if(!id)
+            id = cbi_prop_find(e, "id");
         json_object_object_add(q, id, j);
     }
@@ -65 +68 @@
     j = json_object_new_object();
     source_state(ctx, CBI_START);
-    json_req_element(ctx, e, j);
+    json_req_element(ctx, e, j, 0);
     source_state(ctx, CBI_STOP);
     return j;
 }
 
-json_object* json_req_list(struct cbi_ctx *ctx, struct list_head *l)
+static json_object* json_req_list(struct cbi_ctx *ctx, struct list_head *l)
 {
     struct list_head *p;
@@ -85 +88 @@
 }
 
-json_object* json_req_item(struct cbi_ctx *ctx, struct list_head *l, const char *node)
+static json_object* json_req_item(struct cbi_ctx *ctx, struct list_head *l, const char *node)
 {
     struct cbi_element *e;
@@ -96 +99 @@
     j = json_object_new_object();
     source_state(ctx, CBI_START);
-    json_req_element(ctx, e, j);
+    json_req_element(ctx, e, j, 0);
     source_state(ctx, CBI_STOP);
     return j;
 }
 
-json_object* json_req_auth(struct cbi_ctx *ctx, json_object *in)
+static json_object* json_req_auth(struct cbi_ctx *ctx, json_object *in)
 {
     json_object *_pass;
@@ -124 +127 @@
     }
     return 0;
+}
+
+static struct cbi_element* json_find_element(struct cbi_element *e, const char *n)
+{
+    struct list_head *p;
+    list_for_each(p, &e->elements)
+    {
+        struct cbi_element *e2 = container_of(p, struct cbi_element, list);
+        const char *id = cbi_prop_find(e2, "id");
+        if(id)
+            if(!strcmp(id, n))
+                return e2;
+    }
+    return 0;
+}
+
+static json_object* json_commit_element(struct cbi_ctx *ctx, struct cbi_element *e, json_object *in)
+{
+    json_object *out = 0, *j;
+    if(!in)
+        return 0;
+    json_object_object_foreach(in, key, val)
+    {
+        struct cbi_element *e2;
+        const char *id;
+        e2 = json_find_element(e, key);
+        if(e2)
+        {
+            json_object *elements = json_object_object_get(val, "elements");
+            id = cbi_prop_find(e2, "id");
+            if(!id)
+                continue;
+            j = json_object_new_object();
+            json_object_object_add(j, "commit", json_object_new_string("1"));
+            if(j)
+            {
+                if(!out)
+                    out = json_object_new_object();
+                json_object_object_add(out, key, j);
+            }
+            if(elements)
+                elements = json_commit_element(ctx, e2, elements);
+            if(elements)
+                json_object_object_add(out, "elements", elements);
+        } else {
+            if(!out)
+                out = json_object_new_object();
+            j = json_object_new_object();
+            json_object_object_add(j, "error", json_object_new_string("1"));
+            json_object_object_add(j, "unknown", json_object_new_string("1"));
+            json_object_object_add(out, key, j);
+        }
+    }
+    return out;
+}
+
+static json_object* json_commit(struct cbi_ctx *ctx, const char *node, json_object *in)
+{
+    struct cbi_element *root = cbi_resolv(ctx, node);
+    if(!root)
+        return 0;
+    return json_commit_element(ctx, root, in);
 }
 
@@ -139 +204 @@
 json_object* json_request(struct cbi_ctx *ctx, json_object *in, int auth)
 {
-    json_object *out = 0, *get, *set, *sauth, *vals, *id;
+    json_object *out = 0, *get, *set, *sauth, *vals, *id, *elements;
     get = json_object_object_get(in, "get");
     set = json_object_object_get(in, "set");
@@ -145 +210 @@
     vals = json_object_object_get(in, "vals");
     sauth = json_object_object_get(in, "sauth");
+    elements = json_object_object_get(in, "elements");
     if(get)
     {
@@ -170 +236 @@
     } else if(set)
     {
-    /*  if(!json_auth(sauth) || !auth)
-            cbi_foo();
-    */
+        if(!elements)
+        {
+            out = json_object_new_object();
+            json_object_object_add(out, "commit", json_object_new_string("1"));
+        } else {
+            out = json_commit(ctx, json_object_get_string(set), elements);
+        }
     }
     return out;
@@ -191 +261 @@
     answer = strdup(json_object_to_json_string(out));
     json_object_put(out);
-    json_object_put(in);
+    if(!is_error(in))
+        json_object_put(in);
 //  printf("out -> %s\n", answer);
     return answer;

luci2/cbi2/json.h

@@ -2 +2 @@
 #define _JSON_H__
 
+#define __STRICT_ANSI__
 #include <json.h>
+#undef __STRICT_ANSI__
 #include "cbi.h"
 

luci2/cbi2/lucic.c

@@ -14 +14 @@
 buffer_grow(struct blob_buf *buf, int minlen)
 {
+    int l = buf->buflen;
     buf->buflen += ((minlen / 256) + 1) * 256;
     buf->buf = realloc(buf->buf, buf->buflen);
+    memset(&((char*)buf->buf)[l], 0, buf->buflen - l);
     return !!buf->buf;
 }

luci2/cbi2/test.sh

@@ -1 +1 @@
 #!/bin/sh
+./luci_cli "json|{\"get\":\"path\", \"id\":\"language.luci.lang\"}"
+./luci_cli "json|{\"get\":\"path\", \"id\":\"language.lang.lang\"}"
+./luci_cli "json|{\"set\":\"language.lang.lang\"}"
+./luci_cli "json|{\"set\":\"language.lang.lang\", \"elements\":{\"lang\":{\"value\":\"en\",\"elements\":{\"foo\":{\"value\":\"bar\"}}}}}"
+exit 0
+
 ./luci_cli "json|{\"get\":\"page\"}"
 ./luci_cli "json|{\"get\":\"page\", \"id\":\"network.lan\"}"