Fixed support of ResourceIDGroup : updated class of level 1 and id-wsf with this new class.

5 files changed, 17 insertions, 29 deletions

diff --git a/lasso/id-wsf/abstract_service.h b/lasso/id-wsf/abstract_service.h
index 778f4a41..1e16849a 100644
--- a/lasso/id-wsf/abstract_service.h
+++ b/lasso/id-wsf/abstract_service.h
@@ -31,9 +31,10 @@ extern "C" {
 
 #endif /* __cplusplus */ 
 
+#include <lasso/id-wsf/wsf_profile.h>
 #include <lasso/xml/disco_resource_offering.h>
 #include <lasso/xml/dst_query_item.h>
-#include <lasso/id-wsf/wsf_profile.h>
+#include <lasso/xml/disco_resource_id_group.h>
 
 #define LASSO_TYPE_ABSTRACT_SERVICE (lasso_abstract_service_get_type())
 #define LASSO_ABSTRACT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
@@ -56,8 +57,7 @@ struct _LassoAbstractService {
 
 	LassoDiscoResourceOffering *ResourceOffering;
 
-	char *ResourceID;
-	gboolean is_encrypted;
+	LassoDiscoResourceIDGroup *ResourceIDGroup;
 
 	GList *Data;
 	GList *QueryItem;
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index 3c9ba9f5..422abb0c 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -23,10 +23,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/id-wsf/personal_profile_service.h>
+#include <lasso/xml/disco_resource_id_group.h>
 #include <lasso/xml/dst_data.h>
 #include <lasso/xml/dst_query.h>
 #include <lasso/xml/dst_query_response.h>
+#include <lasso/id-wsf/personal_profile_service.h>
 
 struct _LassoPersonalProfileServicePrivate
 {
@@ -55,14 +56,9 @@ lasso_personal_profile_service_init_query(LassoPersonalProfileService *pp,
   LASSO_DST_QUERY(profile->request)->prefixServiceType = LASSO_PP_PREFIX;
   LASSO_DST_QUERY(profile->request)->hrefServiceType = LASSO_PP_HREF;
 
-  /* set ResourceID (encrypted or not) */
-/*   if (ResourceOffering != NULL) { */
-/* 	  service->ResourceOffering = ResourceOffering; */
-/* 	  LASSO_DST_QUERY(profile->request)->ResourceID = \ */
-/* 		  g_strdup(ResourceOffering->ResourceID); */
-/* 	  LASSO_DST_QUERY(profile->request)->EncryptedResourceID = \ */
-/* 		  g_strdup(ResourceOffering->EncryptedResourceID); */
-/*   } */
+  /* set ResourceIDGroup  */
+  service->ResourceOffering = ResourceOffering;
+  LASSO_DST_QUERY(profile->request)->ResourceIDGroup = ResourceOffering->ResourceIDGroup;
 
   return 0;
 }
@@ -96,15 +92,9 @@ lasso_personal_profile_service_process_request_msg(LassoPersonalProfileService *
 	query = g_object_new(LASSO_TYPE_DST_QUERY, NULL);
 	lasso_node_init_from_message(LASSO_NODE(query), query_soap_msg);
 
-	/* get ResourceID / EncryptedResourceID */
-	if (query->ResourceID != NULL) {
-		LASSO_ABSTRACT_SERVICE(pp)->ResourceID = g_strdup(query->ResourceID);
-		LASSO_ABSTRACT_SERVICE(pp)->is_encrypted = FALSE;
-	}
-	else {
-		LASSO_ABSTRACT_SERVICE(pp)->ResourceID = g_strdup(query->EncryptedResourceID);
-		LASSO_ABSTRACT_SERVICE(pp)->is_encrypted = TRUE;
-	}
+	/* get ResourceIDGroup */
+	LASSO_ABSTRACT_SERVICE(pp)->ResourceIDGroup = query->ResourceIDGroup;
+
 	/* get QueryItems */
 	LASSO_ABSTRACT_SERVICE(pp)->QueryItem = query->QueryItem;
 
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c
index 44dbe08b..8f925882 100644
--- a/lasso/xml/dst_query.c
+++ b/lasso/xml/dst_query.c
@@ -53,9 +53,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ResourceID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDstQuery, ResourceID) },
-	{ "EncryptedResourceID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDstQuery, EncryptedResourceID) },
+	{ "ResourceIDGroup", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, ResourceIDGroup) },
 	{ "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) },
@@ -104,8 +102,7 @@ get_xmlNode(LassoNode *node)
 static void
 instance_init(LassoDstQuery *node)
 {
-	node->ResourceID = NULL;
-	node->EncryptedResourceID = NULL;
+	node->ResourceIDGroup = 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 13d1633f..190bfa3e 100644
--- a/lasso/xml/dst_query.h
+++ b/lasso/xml/dst_query.h
@@ -30,8 +30,9 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
-#include <lasso/xml/xml.h>
+#include <lasso/xml/disco_resource_id_group.h>
 #include <lasso/xml/dst_query_item.h>
+#include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_DST_QUERY (lasso_dst_query_get_type())
 #define LASSO_DST_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
@@ -49,8 +50,7 @@ typedef struct _LassoDstQueryClass LassoDstQueryClass;
 struct _LassoDstQuery {
 	LassoNode parent;
 
-	char *ResourceID;
-	char *EncryptedResourceID;
+	LassoDiscoResourceIDGroup *ResourceIDGroup;
 	GList *QueryItem;
 	GList *Extension;
 
diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c
index 280941bb..9dbc91ee 100644
--- a/lasso/xml/dst_query_response.c
+++ b/lasso/xml/dst_query_response.c
@@ -80,6 +80,7 @@ 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;