API modifiée du cache

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/C/branches/version-0.7@2293 b32b6428-25c9-4566-ad07-03861ab6144f

baseservices/cache.c

@@ -132,48 +132,13 @@ void manage_attributesInfo(device_t *device, cbor_item_t *cbody) {
 }
 
 
-/* Reply to getDeviceAttribute */
-bool reply_getDeviceAttribute(const xAAL_businfo_t *bus,
-			      const xAAL_devinfo_t *me,
-			      const uuid_t *target,
-			      cbor_item_t *cqueryBody,
-			      devices_t *devices) {
-  cbor_item_t *cqueryDevice, *cqueryAttribute, *cbody;
-  uuid_t queryDevice;
-  const char *queryAttribute;
-  size_t queryAttribute_sz;
-  device_t *device = NULL;
-  attr_t *attribute = NULL;
-
-  cqueryDevice = xAAL_cbor_map_get(cqueryBody, "device");
-  if ( !xAAL_cbor_is_uuid(cqueryDevice, &queryDevice) )
-    return false;
-
-  LIST_FOREACH(device, devices, entries)
-    if ( uuid_compare(device->uuid, queryDevice) == 0 )
-      break;
-  if (device == NULL)
-    return false;
-
-  cqueryAttribute = xAAL_cbor_map_get(cqueryBody, "attribute");
-  if ( !cqueryAttribute || !cbor_isa_string(cqueryAttribute) || !cbor_string_is_definite(cqueryAttribute) )
-    return false;
-  queryAttribute = (const char *)cbor_string_handle(cqueryAttribute);
-  queryAttribute_sz = cbor_string_length(cqueryAttribute);
-
-  LIST_FOREACH(attribute, &(device->attributes), entries)
-    if ( strncmp(attribute->name, queryAttribute, queryAttribute_sz) == 0 )
-      break;
-  if (attribute == NULL)
-    return false;
-
-  cbody = cbor_new_definite_map(4);
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("device")),    cbor_move(cqueryDevice) });
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("attribute")), cbor_move(cqueryAttribute) });
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("value")),     attribute->val });
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("date")),      cbor_move(xAAL_cbor_build_int(attribute->date)) });
-
-  return  xAAL_write_busl(bus, me, xAAL_REPLY, "getDeviceAttribute", cbody, target, NULL);
+/* Serialize an attribute into cbor */
+cbor_item_t *get_cbor_attribute(attr_t *attribute) {
+  cbor_item_t *cattribute = cbor_new_definite_map(3);
+  cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("name")),  cbor_move(cbor_build_string(attribute->name)) });
+  cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("value")), attribute->val });
+  cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("date")),  cbor_move(xAAL_cbor_build_int(attribute->date)) });
+  return cattribute;
 }
 
 
@@ -183,10 +148,12 @@ bool reply_getDeviceAttributes(const xAAL_businfo_t *bus,
 			       const uuid_t *target,
 			       cbor_item_t *cqueryBody,
 			       devices_t *devices) {
-  cbor_item_t *cqueryDevice, *cbody, *cattributes, *cattribute;
+  cbor_item_t *cqueryDevice, *cbody, *cattributes, *cache;
   uuid_t queryDevice;
   device_t *device = NULL;
   attr_t *attribute = NULL;
+  size_t i, sz, len;
+  char *name;
 
   cqueryDevice = xAAL_cbor_map_get(cqueryBody, "device");
   if ( !xAAL_cbor_is_uuid(cqueryDevice, &queryDevice) )
@@ -198,18 +165,29 @@ bool reply_getDeviceAttributes(const xAAL_businfo_t *bus,
   if (device == NULL)
     return false;
 
-  cattributes = cbor_new_indefinite_array();
-  LIST_FOREACH(attribute, &(device->attributes), entries) {
-    cattribute = cbor_new_definite_map(3);
-    cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("name")),  cbor_move(cbor_build_string(attribute->name)) });
-    cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("value")), attribute->val });
-    cbor_map_add(cattribute, (struct cbor_pair){ cbor_move(cbor_build_string("date")),  cbor_move(xAAL_cbor_build_int(attribute->date)) });
-    cbor_array_push(cattributes, cattribute);
+  cache = cbor_new_indefinite_array();
+  
+  cattributes = xAAL_cbor_map_get(cqueryBody, "attributes");
+  if (!cattributes || !cbor_isa_array(cattributes) || ((sz=cbor_array_size(cattributes)) == 0) ) {
+    LIST_FOREACH(attribute, &(device->attributes), entries) {
+      cbor_array_push(cache, cbor_move(get_cbor_attribute(attribute)));
+    }
+  } else {
+    for (i=0; i<sz; i++) {
+      name = xAAL_cbor_string_dup(cbor_move(cbor_array_get(cattributes, i)), &len);
+      LIST_FOREACH(attribute, &(device->attributes), entries) {
+        if ( !name || (strcmp(attribute->name, name) == 0) ) {
+          cbor_array_push(cache, cbor_move(get_cbor_attribute(attribute)));
+          break;
+        }
+      }
+      free(name);
+    }
   }
 
   cbody = cbor_new_definite_map(2);
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("device")),     cbor_move(cqueryDevice) });
-  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("attributes")), cbor_move(cattributes) });
+  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("device")), cbor_move(cqueryDevice) });
+  cbor_map_add(cbody, (struct cbor_pair){ cbor_move(cbor_build_string("attributes")),  cbor_move(cache) });
 
   return  xAAL_write_busl(bus, me, xAAL_REPLY, "getDeviceAttributes", cbody, target, NULL);
 }
@@ -263,10 +241,6 @@ void manage_msg(const xAAL_businfo_t *bus, const xAAL_devinfo_t *me,
       if ( !reply_getAttributes(bus, me, source) )
 	fprintf(xAAL_error_log, "Could not reply to getAttributes\n");
 
-    } else if ( strcmp(action, "getDeviceAttribute") == 0 ) {
-      if ( !reply_getDeviceAttribute(bus, me, source, cbody, devices) )
-	fprintf(xAAL_error_log, "Could not reply to getDeviceAttribute\n");
-
     } else if ( strcmp(action, "getDeviceAttributes") == 0 ) {
       if ( !reply_getDeviceAttributes(bus, me, source, cbody, devices) )
 	fprintf(xAAL_error_log, "Could not reply to getDeviceAttributes\n");