diff options
| author | Nicolas Clapies <nclapies@entrouvert.com> | 2004-12-10 14:30:22 +0000 |
|---|---|---|
| committer | Nicolas Clapies <nclapies@entrouvert.com> | 2004-12-10 14:30:22 +0000 |
| commit | d3ada4331576c62b9f17c2c88f06e6a1e41ec3ab (patch) | |
| tree | ef80905c46b389d4d8488956ee087e4d58c64294 | |
| parent | b914dd3d15a20808e31e81dc620605f655f80406 (diff) | |
| download | lasso-d3ada4331576c62b9f17c2c88f06e6a1e41ec3ab.tar.gz lasso-d3ada4331576c62b9f17c2c88f06e6a1e41ec3ab.tar.xz lasso-d3ada4331576c62b9f17c2c88f06e6a1e41ec3ab.zip | |
Replaced LassoDiscoResourceIDGroup with old ResourceID and EncryptedResourceID.
| -rw-r--r-- | lasso/xml/dst_query.c | 7 | ||||
| -rw-r--r-- | lasso/xml/dst_query.h | 6 | ||||
| -rw-r--r-- | lasso/xml/dst_query_response.c | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c index 8f925882..b71fd401 100644 --- a/lasso/xml/dst_query.c +++ b/lasso/xml/dst_query.c @@ -53,7 +53,9 @@ /*****************************************************************************/ static struct XmlSnippet schema_snippets[] = { - { "ResourceIDGroup", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, ResourceIDGroup) }, + { "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, ResourceID) }, + { "EncryptedResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, + EncryptedResourceID) }, { "QueryItem", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstQuery, QueryItem) }, { "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, id) }, { "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, itemID) }, @@ -102,7 +104,8 @@ get_xmlNode(LassoNode *node) static void instance_init(LassoDstQuery *node) { - node->ResourceIDGroup = NULL; + node->ResourceID = NULL; + node->EncryptedResourceID = NULL; node->QueryItem = NULL; node->id = NULL; node->itemID = NULL; diff --git a/lasso/xml/dst_query.h b/lasso/xml/dst_query.h index 190bfa3e..036972ae 100644 --- a/lasso/xml/dst_query.h +++ b/lasso/xml/dst_query.h @@ -30,7 +30,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_resource_id_group.h> +#include <lasso/xml/disco_encrypted_resource_id.h> +#include <lasso/xml/disco_resource_id.h> #include <lasso/xml/dst_query_item.h> #include <lasso/xml/xml.h> @@ -50,7 +51,8 @@ typedef struct _LassoDstQueryClass LassoDstQueryClass; struct _LassoDstQuery { LassoNode parent; - LassoDiscoResourceIDGroup *ResourceIDGroup; + LassoDiscoResourceID *ResourceID; + LassoDiscoEncryptedResourceID *EncryptedResourceID; GList *QueryItem; GList *Extension; diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c index 9dbc91ee..280941bb 100644 --- a/lasso/xml/dst_query_response.c +++ b/lasso/xml/dst_query_response.c @@ -80,7 +80,6 @@ insure_namespace(xmlNode *xmlnode, xmlNs *ns) t = t->next; continue; } - printf("set ns to %s\n", t->name); xmlSetNs(xmlnode, ns); insure_namespace(t, ns); t = t->next; |