Changeset 5532

Timestamp:

05/26/08 00:11:05 (6 months ago)

Author:

morris

Message:

Add some accessors for messages that WiredNetworking? needs

Files:

• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (5 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)

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

@@ -142 +142 @@
-        wi_string_t                                                             *name;
-        wi_uinteger_t                                                   id;
+        wi_array_t                                                              *parameters;
-        wi_hash_t                                                               *parameters_name;
-        wi_hash_t                                                               *parameters_id;
@@ -307 +308 @@
-        wi_set_t                                                                *compatible_protocols;
-        
+        wi_array_t                                                              *messages;
-        wi_hash_t                                                               *messages_name, *messages_id;
-        wi_hash_t                                                               *fields_name, *fields_id;
@@ -647 +649 @@
-        wi_release(p7_spec->compatible_protocols);
-        
+        wi_release(p7_spec->messages);
-        wi_release(p7_spec->messages_name);
-        wi_release(p7_spec->messages_id);
@@ -1432 +1435 @@
-
-
+wi_array_t * wi_p7_spec_messages(wi_p7_spec_t *p7_spec) {
+        wi_enumerator_t                 *enumerator;
+        _wi_p7_spec_message_t   *message;
+        
+        if(!p7_spec->messages) {
+                p7_spec->messages = wi_array_init_with_capacity(wi_array_alloc(), wi_hash_count(p7_spec->messages_id));
+                
+                enumerator = wi_hash_data_enumerator(p7_spec->messages_id);
+                
+                while((message = wi_enumerator_next_data(enumerator)))
+                        wi_array_add_data(p7_spec->messages, message->name);
+        }
+        
+        return p7_spec->messages;
+}
+
+
+
-wi_uinteger_t wi_p7_spec_message_id(wi_p7_spec_t *p7_spec, wi_string_t *message_name) {
-        _wi_p7_spec_message_t   *message;
@@ -1460 +1481 @@
-        
-        return message->name;
+}
+
+
+
+wi_array_t * wi_p7_spec_message_parameters(wi_p7_spec_t *p7_spec, wi_string_t *message_name) {
+        wi_enumerator_t                         *enumerator;
+        _wi_p7_spec_message_t           *message;
+        _wi_p7_spec_parameter_t         *parameter;
+        
+        message = wi_hash_data_for_key(p7_spec->messages_name, message_name);
+        
+        if(!message && _wi_p7_spec_builtin_spec)
+                message = wi_hash_data_for_key(_wi_p7_spec_builtin_spec->messages_name, message_name);
+        
+        if(!message)
+                return NULL;
+        
+        if(!message->parameters) {
+                message->parameters = wi_array_init_with_capacity(wi_array_alloc(), wi_hash_count(message->parameters_id));
+
+                enumerator = wi_hash_data_enumerator(message->parameters_id);
+
+                while((parameter = wi_enumerator_next_data(enumerator)))
+                        wi_array_add_data(message->parameters, parameter->field->name);
+        }
+
+        return message->parameters;
+}
+
+
+
+wi_boolean_t wi_p7_spec_message_requires_parameter(wi_p7_spec_t *p7_spec, wi_string_t *message_name, wi_string_t *parameter_name) {
+        _wi_p7_spec_message_t           *message;
+        _wi_p7_spec_parameter_t         *parameter;
+        
+        message = wi_hash_data_for_key(p7_spec->messages_name, message_name);
+        
+        if(!message && _wi_p7_spec_builtin_spec)
+                message = wi_hash_data_for_key(_wi_p7_spec_builtin_spec->messages_name, message_name);
+        
+        if(!message)
+                return false;
+        
+        parameter = wi_hash_data_for_key(message->parameters_name, parameter_name);
+        
+        if(!parameter)
+                return false;
+        
+        return parameter->required;
-}
-

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

@@ -62 +62 @@
-WI_EXPORT wi_p7_originator_t                    wi_p7_spec_originator(wi_p7_spec_t *);
-WI_EXPORT wi_string_t *                                 wi_p7_spec_xml(wi_p7_spec_t *);
+WI_EXPORT wi_array_t *                                  wi_p7_spec_messages(wi_p7_spec_t *);
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_message_id(wi_p7_spec_t *, wi_string_t *);
-WI_EXPORT wi_string_t *                                 wi_p7_spec_message_name(wi_p7_spec_t *, wi_uinteger_t);
+WI_EXPORT wi_array_t *                                  wi_p7_spec_message_parameters(wi_p7_spec_t *, wi_string_t *);
+WI_EXPORT wi_boolean_t                                  wi_p7_spec_message_requires_parameter(wi_spec_t *, wi_string_t *, wi_string_t *);
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_field_id(wi_p7_spec_t *, wi_string_t *);
-WI_EXPORT wi_string_t *                                 wi_p7_spec_field_name(wi_p7_spec_t *, wi_uinteger_t);