Changeset 5371

Timestamp:

03/13/08 11:01:38 (4 months ago)

Author:

morris

Message:

Allow loading of collections of fields

Files:

• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (8 diffs)

libwired/trunk/libwired/p7/wi-p7-spec.c

@@ -147 +147 @@
-
-static _wi_p7_spec_parameter_t *                        _wi_p7_spec_parameter_with_node(wi_p7_spec_t *, xmlNodePtr, _wi_p7_spec_message_t *);
+static _wi_p7_spec_parameter_t *                        _wi_p7_spec_parameter_with_field(wi_p7_spec_t *, _wi_p7_spec_message_t *, _wi_p7_spec_field_t *);
-static void                                                                     _wi_p7_spec_parameter_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_parameter_description(wi_runtime_instance_t *);
@@ -284 +285 @@
-        wi_hash_t                                                               *messages_name, *messages_id;
-        wi_hash_t                                                               *fields_name, *fields_id;
+        wi_hash_t                                                               *collections_name;
-        wi_hash_t                                                               *types_name, *types_id;
-        wi_hash_t                                                               *transactions_name;
@@ -303 +305 @@
-static wi_boolean_t                                                     _wi_p7_spec_load_types(wi_p7_spec_t *, xmlNodePtr);
-static wi_boolean_t                                                     _wi_p7_spec_load_fields(wi_p7_spec_t *, xmlNodePtr);
+static wi_boolean_t                                                     _wi_p7_spec_load_collection(wi_p7_spec_t *, xmlNodePtr);
+static _wi_p7_spec_field_t *                            _wi_p7_spec_load_field(wi_p7_spec_t *, xmlNodePtr);
-static wi_boolean_t                                                     _wi_p7_spec_load_messages(wi_p7_spec_t *, xmlNodePtr);
-static wi_boolean_t                                                     _wi_p7_spec_load_transactions(wi_p7_spec_t *, xmlNodePtr);
@@ -540 +544 @@
-                500, wi_hash_null_key_callbacks, wi_hash_default_value_callbacks);
-
+        p7_spec->collections_name               = wi_hash_init_with_capacity(wi_hash_alloc(), 20);
+
-        p7_spec->types_name                             = wi_hash_init_with_capacity(wi_hash_alloc(), 20);
-        p7_spec->types_id                               = wi_hash_init_with_capacity_and_callbacks(wi_hash_alloc(),
@@ -821 +827 @@
-
-static wi_boolean_t _wi_p7_spec_load_fields(wi_p7_spec_t *p7_spec, xmlNodePtr node) {
+        xmlNodePtr              field_node;
+        
+        for(field_node = node->children; field_node != NULL; field_node = field_node->next) {
+                if(field_node->type == XML_ELEMENT_NODE) {
+                        if(strcmp((const char *) field_node->name, "field") == 0) {
+                                if(!_wi_p7_spec_load_field(p7_spec, field_node))
+                                        return false;
+                        }
+                        else if(strcmp((const char *) field_node->name, "collection") == 0) {
+                                if(!_wi_p7_spec_load_collection(p7_spec, field_node))
+                                        return false;
+                        }
+                }
+        }
+        
+        return true;
+}
+
+
+
+static wi_boolean_t _wi_p7_spec_load_collection(wi_p7_spec_t *p7_spec, xmlNodePtr node) {
+        wi_array_t                              *collection;
+        wi_string_t                             *name;
-        _wi_p7_spec_field_t             *field;
-        xmlNodePtr                              field_node;
-        
+        name = wi_autorelease(wi_p7_xml_copy_string_for_attribute(node, WI_STR("name")));
+        
+        if(!name) {
+                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
+                        WI_STR("Collection has no \"name\""));
+                
+                return false;
+        }
+
+        if(wi_hash_data_for_key(p7_spec->collections_name, name)) {
+                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
+                        WI_STR("Collection with name \"%@\" already exists"),
+                        name);
+                
+                return false;
+        }
+        
+        collection = wi_array();
+        
-        for(field_node = node->children; field_node != NULL; field_node = field_node->next) {
-                if(field_node->type == XML_ELEMENT_NODE) {
-field_with_node
+load_field
-                        
-                        if(!field)
-                                return false;
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        return true;
+}
+
+
+
+static _wi_p7_spec_field_t * _wi_p7_spec_load_field(wi_p7_spec_t *p7_spec, xmlNodePtr node) {
+        _wi_p7_spec_field_t             *field;
+        
+        field = _wi_p7_spec_field_with_node(p7_spec, node);
+        
+        if(!field)
+                return NULL;
+        
+        if(wi_hash_data_for_key(p7_spec->fields_name, field->name)) {
+                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
+                        WI_STR("Field with name \"%@\" already exists"),
+                        field->name);
+                
+                return NULL;
+        }
+        
+        if(wi_hash_data_for_key(p7_spec->fields_id, (void *) field->id)) {
+                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
+                        WI_STR("Field with id %lu (name \"%@\") already exists"),
+                        field->id, field->name);
+                
+                return NULL;
+        }
+
+        wi_hash_set_data_for_key(p7_spec->fields_name, field, field->name);
+        wi_hash_set_data_for_key(p7_spec->fields_id, field, (void *) field->id);
+        
+        return field;
-}
-
@@ -1787 +1859 @@
-
-static _wi_p7_spec_message_t * _wi_p7_spec_message_with_node(wi_p7_spec_t *p7_spec, xmlNodePtr node) {
+        wi_enumerator_t                         *enumerator;
+        wi_array_t                                      *fields;
+        wi_string_t                                     *field_name, *collection_name, *use;
-        xmlNodePtr                                      parameter_node;
-        _wi_p7_spec_message_t           *message;
-        _wi_p7_spec_parameter_t         *parameter;
+        _wi_p7_spec_field_t                     *field;
+        wi_boolean_t                            required;
-
-    message = wi_autorelease(wi_runtime_create_instance(_wi_p7_spec_message_runtime_id, sizeof(_wi_p7_spec_message_t)));
@@ -1817 +1894 @@
-        for(parameter_node = node->children; parameter_node != NULL; parameter_node = parameter_node->next) {
-                if(parameter_node->type == XML_ELEMENT_NODE) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                wi_error_set_libwired_p7_error(WI_ERROR_P7_INVALIDSPEC,
-Message \"%@\" has a duplicate field \"%@
-, parameter->field->name
+Parameter in message \"%@\" has no \"field\" or \"collection
+
-                                
-                                return NULL;
-                        }
-                        
-                        wi_hash_set_data_for_key(message->parameters_name, parameter, parameter->field->name);
-                        wi_hash_set_data_for_key(message->parameters_id, parameter, (void *) parameter->field->id);
-                        
-                        if(parameter->required)
-                                message->required_parameters++;
-                }
-        }
@@ -1910 +2049 @@
-                parameter->required = (wi_string_case_insensitive_compare(use, WI_STR("required")) == 0);
-        }
+
+        return parameter;
+}
+
+
+
+static _wi_p7_spec_parameter_t * _wi_p7_spec_parameter_with_field(wi_p7_spec_t *p7_spec, _wi_p7_spec_message_t *message, _wi_p7_spec_field_t *field) {
+        _wi_p7_spec_parameter_t *parameter;
+
+    parameter = wi_autorelease(wi_runtime_create_instance(_wi_p7_spec_parameter_runtime_id, sizeof(_wi_p7_spec_parameter_t)));
+        parameter->field = wi_retain(field);
-
-        return parameter;