diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2007-06-13 12:19:48 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2007-06-13 12:19:48 +0000 |
| commit | b51330fe820a5ff9156f7aa0f55fa307de10b042 (patch) | |
| tree | f9560aeaceaf354e51b0e078bdb397193e128d09 | |
| parent | 6b88ea8e017b7f0e4f8d0accdb741ead2e04d12a (diff) | |
| download | lasso-b51330fe820a5ff9156f7aa0f55fa307de10b042.tar.gz lasso-b51330fe820a5ff9156f7aa0f55fa307de10b042.tar.xz lasso-b51330fe820a5ff9156f7aa0f55fa307de10b042.zip | |
changed buildQueryResponseMsg to parseQueryItems + buildResponseMsg
| -rw-r--r-- | lasso/id-wsf-2.0/data_service.c | 7 | ||||
| -rw-r--r-- | lasso/id-wsf-2.0/data_service.h | 3 | ||||
| -rw-r--r-- | swig/Lasso-wsf2.i | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c index 14ee09db..0c923f6f 100644 --- a/lasso/id-wsf-2.0/data_service.c +++ b/lasso/id-wsf-2.0/data_service.c @@ -153,7 +153,7 @@ lasso_idwsf2_data_service_process_query_msg(LassoIdWsf2DataService *service, con } gint -lasso_idwsf2_data_service_build_query_response_msg(LassoIdWsf2DataService *service) +lasso_idwsf2_data_service_parse_query_items(LassoIdWsf2DataService *service) { LassoWsf2Profile *profile = LASSO_WSF2_PROFILE(service); LassoIdWsf2DstRefQuery *request; @@ -239,6 +239,7 @@ lasso_idwsf2_data_service_build_query_response_msg(LassoIdWsf2DataService *servi break; } } + /* Free XML parsing objects */ xmlUnlinkNode(service->data); xmlXPathFreeContext(xpathCtx); @@ -248,8 +249,6 @@ lasso_idwsf2_data_service_build_query_response_msg(LassoIdWsf2DataService *servi res = LASSO_DST_ERROR_QUERY_FAILED; } - lasso_wsf2_profile_build_response_msg(profile); - return res; } @@ -298,6 +297,8 @@ lasso_idwsf2_data_service_get_attribute_node(LassoIdWsf2DataService *service, co g_return_val_if_fail(LASSO_IS_IDWSF2_DATA_SERVICE(service), NULL); + g_return_val_if_fail(LASSO_IS_IDWSF2_DSTREF_QUERY_RESPONSE(profile->response), NULL); + response = LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(profile->response); /* If no item_id is given, return the first item */ diff --git a/lasso/id-wsf-2.0/data_service.h b/lasso/id-wsf-2.0/data_service.h index 358a20f0..0d59104c 100644 --- a/lasso/id-wsf-2.0/data_service.h +++ b/lasso/id-wsf-2.0/data_service.h @@ -85,8 +85,7 @@ LASSO_EXPORT gint lasso_idwsf2_data_service_add_query_item( LASSO_EXPORT gint lasso_idwsf2_data_service_process_query_msg(LassoIdWsf2DataService *service, const gchar *message); -LASSO_EXPORT gint lasso_idwsf2_data_service_build_query_response_msg( - LassoIdWsf2DataService *service); +LASSO_EXPORT gint lasso_idwsf2_data_service_parse_query_items(LassoIdWsf2DataService *service); LASSO_EXPORT gint lasso_idwsf2_data_service_process_query_response_msg( LassoIdWsf2DataService *service, const gchar *message); diff --git a/swig/Lasso-wsf2.i b/swig/Lasso-wsf2.i index 605cbcf7..5e60951a 100644 --- a/swig/Lasso-wsf2.i +++ b/swig/Lasso-wsf2.i @@ -374,7 +374,7 @@ typedef struct { END_THROW_ERROR() THROW_ERROR() - int buildQueryResponseMsg(); + int parseQueryItems(); END_THROW_ERROR() THROW_ERROR() @@ -452,7 +452,7 @@ typedef struct { #define LassoIdWsf2DataService_initQuery lasso_idwsf2_data_service_init_query #define LassoIdWsf2DataService_addQueryItem lasso_idwsf2_data_service_add_query_item #define LassoIdWsf2DataService_processQueryMsg lasso_idwsf2_data_service_process_query_msg -#define LassoIdWsf2DataService_buildQueryResponseMsg lasso_idwsf2_data_service_build_query_response_msg +#define LassoIdWsf2DataService_parseQueryItems lasso_idwsf2_data_service_parse_query_items #define LassoIdWsf2DataService_processQueryResponseMsg lasso_idwsf2_data_service_process_query_response_msg #define LassoIdWsf2DataService_getAttributeNode(self, itemId) \ get_xml_string(lasso_idwsf2_data_service_get_attribute_node(self, itemId)) |