update internal code to use new_from_export style

11 files changed, 164 insertions, 188 deletions

diff --git a/lasso/Attic/protocols/logout_request.c b/lasso/Attic/protocols/logout_request.c
index 551515a7..1aaaadef 100644
--- a/lasso/Attic/protocols/logout_request.c
+++ b/lasso/Attic/protocols/logout_request.c
@@ -1,3 +1,4 @@
+
 /* $Id$ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
@@ -68,10 +69,10 @@ GType lasso_logout_request_get_type() {
 }
 
 LassoNode *
-lasso_logout_request_new(const xmlChar *providerID,
-			 const xmlChar *nameIdentifier,
-			 const xmlChar *nameQualifier,
-			 const xmlChar *format)
+lasso_logout_request_new(gchar *providerID,
+			 gchar *nameIdentifier,
+			 gchar *nameQualifier,
+			 gchar *format)
 {
   LassoNode *request, *identifier;
   xmlChar *id, *time;
@@ -110,8 +111,8 @@ lasso_logout_request_new(const xmlChar *providerID,
   return(request);
 }
 
-LassoNode *
-lasso_logout_request_new_from_query(const xmlChar *query)
+static LassoNode *
+lasso_logout_request_new_from_query(gchar *query)
 {
   LassoNode *request, *identifier;
   xmlChar *str;
@@ -172,8 +173,8 @@ lasso_logout_request_new_from_query(const xmlChar *query)
   return(request);
 }
 
-LassoNode *
-lasso_logout_request_new_from_soap(const xmlChar *buffer)
+static LassoNode *
+lasso_logout_request_new_from_soap(gchar *buffer)
 {
   LassoNode *request;
   LassoNode *envelope, *lassoNode_request;
@@ -195,3 +196,25 @@ lasso_logout_request_new_from_soap(const xmlChar *buffer)
   
   return(request);
 }
+
+
+LassoNode*
+lasso_logout_request_new_from_export(gchar                *buffer,
+				     lassoNodeExportTypes  export_type)
+{
+  LassoNode *request;
+
+  g_return_val_if_fail(buffer != NULL, NULL);
+
+  switch(export_type){
+  case lassoNodeExportTypeQuery:
+    request = lasso_logout_request_new_from_query(buffer);
+    break;
+  case lassoNodeExportTypeSoap:
+    request = lasso_logout_request_new_from_soap(buffer);
+    break;
+  default:
+  }
+
+  return(request);
+}
diff --git a/lasso/Attic/protocols/logout_request.h b/lasso/Attic/protocols/logout_request.h
index fa97f0e8..90d3d03e 100644
--- a/lasso/Attic/protocols/logout_request.h
+++ b/lasso/Attic/protocols/logout_request.h
@@ -52,13 +52,13 @@ struct _LassoLogoutRequestClass {
   LassoLibLogoutRequestClass parent;
 };
 
-LASSO_EXPORT GType      lasso_logout_request_get_type       (void);
-LASSO_EXPORT LassoNode* lasso_logout_request_new            (const xmlChar *providerID,
-							     const xmlChar *nameIdentifier,
-							     const xmlChar *nameQualifier,
-							     const xmlChar *format);
-LASSO_EXPORT LassoNode* lasso_logout_request_new_from_query (const xmlChar *query);
-LASSO_EXPORT LassoNode* lasso_logout_request_new_from_soap  (const xmlChar *buffer);
+LASSO_EXPORT GType      lasso_logout_request_get_type        (void);
+LASSO_EXPORT LassoNode* lasso_logout_request_new             (gchar *providerID,
+							      gchar *nameIdentifier,
+							      gchar *nameQualifier,
+							      gchar *format);
+LASSO_EXPORT LassoNode* lasso_logout_request_new_from_export (gchar *buffer,
+							      lassoNodeExportTypes export_type);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/Attic/protocols/logout_response.c b/lasso/Attic/protocols/logout_response.c
index facf9d8c..ea55eb39 100644
--- a/lasso/Attic/protocols/logout_response.c
+++ b/lasso/Attic/protocols/logout_response.c
@@ -29,7 +29,7 @@
 /* public methods                                                            */
 /*****************************************************************************/
 
-xmlChar*
+gchar*
 lasso_logout_response_get_status_code_value(LassoLogoutResponse *response)
 {
   LassoNodeClass *statusCode_class;
@@ -79,9 +79,9 @@ GType lasso_logout_response_get_type() {
 }
 
 LassoNode*
-lasso_logout_response_new(const xmlChar *providerID,
-			  const xmlChar *statusCodeValue,
-			  LassoNode     *request)
+lasso_logout_response_new(gchar       *providerID,
+			  const gchar *statusCodeValue,
+			  LassoNode   *request)
 {
   LassoNode *response, *ss, *ssc, *request_providerID, *request_relayState;
   xmlChar *inResponseTo, *recipient, *relayState;
@@ -143,7 +143,7 @@ lasso_logout_response_new(const xmlChar *providerID,
 }
 
 LassoNode *
-lasso_logout_response_new_from_dump(const xmlChar *buffer)
+lasso_logout_response_new_from_dump(gchar *buffer)
 {
   LassoNode *response;
   
@@ -153,9 +153,8 @@ lasso_logout_response_new_from_dump(const xmlChar *buffer)
   return (response);
 }
 
-/* build a LogoutResponse from a query form LogoutResponse */
 LassoNode *
-lasso_logout_response_new_from_query(const xmlChar *query)
+lasso_logout_response_new_from_query(gchar *query)
 {
   LassoNode *response;
   xmlChar *relayState, *consent;
@@ -203,44 +202,37 @@ lasso_logout_response_new_from_query(const xmlChar *query)
   return(response);
 }
 
-/* build a LogoutResponse from a query form LogoutRequest */
 LassoNode *
-lasso_logout_response_new_from_request_query(const xmlChar *query,
-					     const xmlChar *providerID,
-					     const xmlChar *statusCodeValue)
+lasso_logout_response_new_from_request_export(gchar                *buffer,
+					      lassoNodeExportTypes  export_type,
+					      gchar                *providerID,
+					      gchar                *statusCodeValue)
 {
   LassoNode *request, *response;
 
-  request = lasso_logout_request_new_from_query(query);
-  
-  response = lasso_logout_response_new(providerID,
-				       statusCodeValue,
-				       request);
-  lasso_node_destroy(request);
-  
-  return(response);
-}
-
-/* build a LogoutRespose from a soap form LogoutRequest */
-LassoNode *
-lasso_logout_response_new_from_request_soap(const xmlChar *buffer,
-					    const xmlChar *providerID,
-					    const xmlChar *statusCodeValue)
-{
-  LassoNode *request, *response;
+  g_return_val_if_fail(buffer != NULL, NULL);
 
-  request = lasso_logout_request_new_from_soap(buffer);
+  switch(export_type){
+  case lassoNodeExportTypeQuery:
+    request = lasso_logout_request_new_from_export(buffer, export_type);
+    break;
+  case lassoNodeExportTypeSoap:
+    request = lasso_logout_request_new_from_export(buffer, export_type);
+    break;
+  default:
+    debug(ERROR, "Unkown export type\n");
+    return(NULL);
+  }
 
   response = lasso_logout_response_new(providerID,
 				       statusCodeValue,
 				       request);
-  lasso_node_destroy(request);
 
   return(response);
 }
 
 LassoNode *
-lasso_logout_response_new_from_soap(const xmlChar *buffer)
+lasso_logout_response_new_from_soap(gchar *buffer)
 {
   LassoNode *response;
   LassoNode *envelope, *lassoNode_response;
@@ -262,3 +254,26 @@ lasso_logout_response_new_from_soap(const xmlChar *buffer)
   
   return(response);
 }
+
+LassoNode*
+lasso_logout_response_new_from_export(gchar                *buffer,
+				      lassoNodeExportTypes  export_type)
+{
+  LassoNode *response;
+
+  g_return_val_if_fail(buffer != NULL, NULL);
+
+  switch(export_type){
+  case lassoNodeExportTypeQuery:
+    response = lasso_logout_response_new_from_query(buffer);
+    break;
+  case lassoNodeExportTypeSoap:
+    response = lasso_logout_response_new_from_soap(buffer);
+    break;
+  default:
+    debug(ERROR, "Unknown export type\n");
+    return(NULL);
+  }
+
+  return(response);
+}
diff --git a/lasso/Attic/protocols/logout_response.h b/lasso/Attic/protocols/logout_response.h
index f783e729..e8b3cc3e 100644
--- a/lasso/Attic/protocols/logout_response.h
+++ b/lasso/Attic/protocols/logout_response.h
@@ -53,24 +53,19 @@ struct _LassoLogoutResponseClass {
   LassoLibLogoutResponseClass parent;
 };
 
-LASSO_EXPORT GType      lasso_logout_response_get_type               (void);
-LASSO_EXPORT LassoNode* lasso_logout_response_new                    (const xmlChar *providerID,
-								      const xmlChar *statusCodeValue,
-								      LassoNode     *request);
+LASSO_EXPORT GType      lasso_logout_response_get_type                (void);
 
-LASSO_EXPORT LassoNode* lasso_logout_response_new_from_dump          (const xmlChar *buffer);
+LASSO_EXPORT LassoNode* lasso_logout_response_new                     (gchar       *providerID,
+								       const gchar *statusCodeValue,
+								       LassoNode   *request);
 
-LASSO_EXPORT LassoNode* lasso_logout_response_new_from_query         (const xmlChar *query);
+LASSO_EXPORT LassoNode* lasso_logout_response_new_from_export         (gchar                *buffer,
+								       lassoNodeExportTypes  export_type);
 
-LASSO_EXPORT LassoNode* lasso_logout_response_new_from_request_query (const xmlChar *query,
-								      const xmlChar *providerID,
-								      const xmlChar *statusCodeValue);
-
-LASSO_EXPORT LassoNode* lasso_logout_response_new_from_request_soap  (const xmlChar *buffer,
-								      const xmlChar *providerID,
-								      const xmlChar *statusCodeValue);
-
-LASSO_EXPORT LassoNode* lasso_logout_response_new_from_soap          (const xmlChar *buffer);
+LASSO_EXPORT LassoNode* lasso_logout_response_new_from_request_export (gchar                *buffer,
+								       lassoNodeExportTypes  export_type,
+								       gchar                *providerID,
+								       gchar                *statusCodeValue);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index aee2c110..68ef5c65 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -103,15 +103,18 @@ lasso_logout_build_response_msg(LassoLogout *logout)
   LassoProfileContext *profileContext;
   LassoProvider *provider;
   xmlChar *protocolProfile;
+  int codeError = 0;
+  
+  if(!LASSO_IS_LOGOUT(logout)){
+    debug(ERROR, "Not a Logout object\n");
+    return(-1);
+  }
   
-  g_return_val_if_fail(LASSO_IS_LOGOUT(logout), -1);
-
   profileContext = LASSO_PROFILE_CONTEXT(logout);
 
-  printf("get provider id %s\n",  profileContext->remote_providerID);
   provider = lasso_server_get_provider(profileContext->server, profileContext->remote_providerID);
   if(provider==NULL){
-    debug(ERROR, "Provider not found (ProviderID = %s)\n", profileContext->remote_providerID);
+    debug(ERROR, "Provider not found %s\n", profileContext->remote_providerID);
     return(-2);
   }
 
@@ -122,12 +125,12 @@ lasso_logout_build_response_msg(LassoLogout *logout)
   }
 
   if(xmlStrEqual(protocolProfile, lassoLibProtocolProfileSloSpSoap) || xmlStrEqual(protocolProfile, lassoLibProtocolProfileSloIdpSoap)){
-    debug(DEBUG, "building a soap response message\n");
-    profileContext->msg_url = lasso_provider_get_singleLogoutServiceURL(provider);
+    debug(DEBUG, "Building a soap response message\n");
+    profileContext->msg_url = NULL;
     profileContext->msg_body = lasso_node_export_to_soap(profileContext->response);
   }
   else if(xmlStrEqual(protocolProfile,lassoLibProtocolProfileSloSpHttp)||xmlStrEqual(protocolProfile,lassoLibProtocolProfileSloIdpHttp)){
-    debug(DEBUG, "building a http get response message\n");
+    debug(DEBUG, "Building a http get response message\n");
     profileContext->response_type = lassoHttpMethodRedirect;
     profileContext->msg_url = lasso_node_export_to_query(profileContext->response,
 							 profileContext->server->signature_method,
@@ -237,11 +240,11 @@ lasso_logout_process_request_msg(LassoLogout      *logout,
   switch(request_method){
   case lassoHttpMethodSoap:
     debug(DEBUG, "Build a logout request from soap msg\n");
-    profileContext->request = lasso_logout_request_new_from_soap(request_msg);
+    profileContext->request = lasso_logout_request_new_from_export(request_msg, lassoNodeExportTypeSoap);
     break;
   case lassoHttpMethodRedirect:
     debug(DEBUG, "Build a logout request from query msg\n");
-    profileContext->request = lasso_logout_request_new_from_query(request_msg);
+    profileContext->request = lasso_logout_request_new_from_export(request_msg, lassoNodeExportTypeQuery);
     break;
   case lassoHttpMethodGet:
     debug(WARNING, "TODO, implement the get method\n");
@@ -323,10 +326,10 @@ lasso_logout_process_response_msg(LassoLogout      *logout,
   /* parse LogoutResponse */
   switch(response_method){
   case lassoHttpMethodSoap:
-    profileContext->response = lasso_logout_response_new_from_soap(response_msg);
+    profileContext->response = lasso_logout_response_new_from_export(response_msg, lassoNodeExportTypeSoap);
     break;
   case lassoHttpMethodRedirect:
-    profileContext->response = lasso_logout_response_new_from_query(response_msg);
+    profileContext->response = lasso_logout_response_new_from_export(response_msg, lassoNodeExportTypeQuery);
     break;
   default:
     debug(ERROR, "Unknown response method\n");
diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index 5a28217f..1333e40f 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -143,8 +143,8 @@ PyObject *logout_init_request(PyObject *self, PyObject *args) {
   gchar    *remote_providerID;
   gint      codeError;
 
-  if (CheckArgs(args, "OS:logout_init_request")) {
-    if(!PyArg_ParseTuple(args, (char *) "Os:logout_init_request",
+  if (CheckArgs(args, "Os:logout_init_request")) {
+    if(!PyArg_ParseTuple(args, (char *) "O|s:logout_init_request",
 			 &logout_obj, &remote_providerID))
       return NULL;
   }
diff --git a/python/examples/logout.py b/python/examples/logout.py
index ec3ed914..faa31e4b 100644
--- a/python/examples/logout.py
+++ b/python/examples/logout.py
@@ -11,8 +11,9 @@ spserver = lasso.Server.new("../../examples/sp.xml",
 			    lasso.signatureMethodRsaSha1)
 
 spserver.add_provider("../../examples/idp.xml", None, None)
+spserver.add_provider("../../examples/idp2.xml", None, None)
 
-spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">LLLLLLLLLLLLLLLLLLLLLLLLL</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
+spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">11111111111111111111111111</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity><LassoIdentity RemoteProviderID=\"https://identity-provider2:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">22222222222222222222222222</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
 
 spuser = lasso.User.new_from_dump(spuser_dump)
 
@@ -22,8 +23,13 @@ splogout.init_request("https://identity-provider:2003/liberty-alliance/metadata"
 splogout.build_request_msg()
 
 request_msg = splogout.msg_body
-print 'request url : ', splogout.msg_url
-print 'request body : ', splogout.msg_body
+msg_url  = splogout.msg_url
+msg_body = splogout.msg_body
+
+splogout.destroy()
+
+print 'request url : ', msg_url
+print 'request body : ', msg_body
 
 
 # LogoutResponse :
@@ -36,9 +42,15 @@ idpuser_dump = "<LassoUser><LassoAssertions></LassoAssertions><LassoIdentities><
 idpuser = lasso.User.new_from_dump(idpuser_dump)
 
 idplogout = lasso.Logout.new(idpserver, idpuser, lasso.providerTypeIdp)
-idplogout.process_request_msg(request_msg, lasso.httpMethodSoap)
-idplogout.build_response_msg()
-print 'url : ', idplogout.msg_url
-print 'body : ', idplogout.msg_body
+#idplogout.process_request_msg(request_msg, lasso.httpMethodSoap)
+#idplogout.build_response_msg()
+
+#msg_url  = idplogout.msg_url
+#msg_body = idplogout.msg_body
+#print 'body : ', idplogout.msg_body
+
+# process the response :
+#splogout = lasso.Logout.new(spserver, spuser, lasso.providerTypeSp)
+#splogout.process_response_msg(msg_body, lasso.httpMethodSoap)
 
 lasso.shutdown()
diff --git a/python/protocols/py_logout_request.c b/python/protocols/py_logout_request.c
index fde13d34..ee4a75bf 100644
--- a/python/protocols/py_logout_request.c
+++ b/python/protocols/py_logout_request.c
@@ -42,10 +42,10 @@ PyObject *LassoLogoutRequest_wrap(LassoLogoutRequest *request) {
 /******************************************************************************/
 
 PyObject *logout_request_new(PyObject *self, PyObject *args) {
-  const xmlChar *providerID;
-  const xmlChar *nameIdentifier;
-  const xmlChar *nameQualifier;
-  const xmlChar *format;
+  gchar *providerID;
+  gchar *nameIdentifier;
+  gchar *nameQualifier;
+  gchar *format;
 
   LassoNode *request;
 
@@ -62,36 +62,19 @@ PyObject *logout_request_new(PyObject *self, PyObject *args) {
   return (LassoLogoutRequest_wrap(LASSO_LOGOUT_REQUEST(request)));
 }
 
-PyObject *logout_request_new_from_soap(PyObject *self, PyObject *args) {
-  const xmlChar *soap_buffer;
+PyObject *logout_request_new_from_export(PyObject *self, PyObject *args) {
+  gchar               *buffer;
+  lassoNodeExportTypes export_type;
+  LassoNode           *request;
 
-  LassoNode     *request;
-
-  if (CheckArgs(args, "S:logout_request_new_from_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:logout_request_new_from_soap",
-			 &soap_buffer))
-      return NULL;
-  }
-  else return NULL;
-
-  request = lasso_logout_request_new_from_soap(soap_buffer);
-
-  return (LassoLogoutRequest_wrap(LASSO_LOGOUT_REQUEST(request)));
-}
-
-PyObject *logout_request_new_from_query(PyObject *self, PyObject *args) {
-  const xmlChar *query;
-
-  LassoNode     *request;
-
-  if (CheckArgs(args, "S:logout_request_new_from_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:logout_request_new_from_query",
-			 &query))
+  if (CheckArgs(args, "SS:logout_request_new_from_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ss:logout_request_new_from_export",
+			 &buffer, &export_type))
       return NULL;
   }
   else return NULL;
 
-  request = lasso_logout_request_new_from_query(query);
+  request = lasso_logout_request_new_from_export(buffer, export_type);
 
   return (LassoLogoutRequest_wrap(LASSO_LOGOUT_REQUEST(request)));
 }
diff --git a/python/protocols/py_logout_request.h b/python/protocols/py_logout_request.h
index 38cf1e46..da73b488 100644
--- a/python/protocols/py_logout_request.h
+++ b/python/protocols/py_logout_request.h
@@ -39,7 +39,6 @@ PyObject *LassoLogoutRequest_wrap(LassoLogoutRequest *request);
 
 PyObject *logout_request_getattr(PyObject *self, PyObject *args);
 PyObject *logout_request_new(PyObject *self, PyObject *args);
-PyObject *logout_request_new_from_soap(PyObject *self, PyObject *args);
-PyObject *logout_request_new_from_query(PyObject *self, PyObject *args);
+PyObject *logout_request_new_from_export(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_LOGOUT_REQUEST_H__ */
diff --git a/python/protocols/py_logout_response.c b/python/protocols/py_logout_response.c
index 34f535cd..09f57f2d 100644
--- a/python/protocols/py_logout_response.c
+++ b/python/protocols/py_logout_response.c
@@ -41,97 +41,46 @@ PyObject *LassoLogoutResponse_wrap(LassoLogoutResponse *response) {
 
 /******************************************************************************/
 
-PyObject *logout_response_new_from_request_soap(PyObject *self, PyObject *args) {
-  const xmlChar *request_soap_dump;
-  const xmlChar *providerID;
-  const xmlChar *status_code_value;
+PyObject *logout_response_new_from_request_export(PyObject *self, PyObject *args) {
+  gchar *request_export;
+  gchar *providerID;
+  gchar *status_code_value;
+  gint   export_type;
 
   LassoNode *response = NULL;
 
-  if (CheckArgs(args, "SSS:logout_response_new_from_request_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "sss:logout_response_new_from_request_soap",
-			 &request_soap_dump,
+  if (CheckArgs(args, "SSSS:logout_response_new_from_request_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ssss:logout_response_new_from_request_export",
+			 &request_export,
+			 &export_type,
 			 &providerID,
 			 &status_code_value))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_logout_response_new_from_request_soap(request_soap_dump,
-							 providerID,
-							 status_code_value);
+  response = lasso_logout_response_new_from_request_export(request_export,
+							   export_type,
+							   providerID,
+							   status_code_value);
 
   return (LassoLogoutResponse_wrap(LASSO_LOGOUT_RESPONSE(response)));
 }
 
-PyObject *logout_response_new_from_soap(PyObject *self, PyObject *args) {
-  const xmlChar *request_soap_dump;
+PyObject *logout_response_new_from_export(PyObject *self, PyObject *args) {
+  gchar *request_export;
+  gint   export_type;
 
   LassoNode *response = NULL;
 
-  if (CheckArgs(args, "S:logout_response_new_from_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:logout_response_new_from_soap",
-			 &request_soap_dump))
+  if (CheckArgs(args, "SS:logout_response_new_from_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ss:logout_response_new_from_export",
+			 &request_export, &export_type))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_logout_response_new_from_soap(request_soap_dump);
-
-  return (LassoLogoutResponse_wrap(LASSO_LOGOUT_RESPONSE(response)));
-}
-
-PyObject *logout_response_new_from_dump(PyObject *self, PyObject *args) {
-  const xmlChar *dump;
-
-  LassoNode *response = NULL;
-
-  if (CheckArgs(args, "S:logout_response_new_from_dump")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:logout_response_new_from_dump",
-			 &dump))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_logout_response_new_from_soap(dump);
-
-  return (LassoLogoutResponse_wrap(LASSO_LOGOUT_RESPONSE(response)));
-}
-
-PyObject *logout_response_new_from_request_query(PyObject *self, PyObject *args) {
-  const xmlChar *query;
-  const xmlChar *providerID;
-  const xmlChar *status_code_value;
-
-  LassoNode *response = NULL;
-
-  if (CheckArgs(args, "SSS:logout_response_new_from_request_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "sss:logout_response_new_from_request_query",
-			 &query,
-			 &providerID,
-			 &status_code_value))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_logout_response_new_from_request_query(query, providerID, status_code_value);
-
-  return (LassoLogoutResponse_wrap(LASSO_LOGOUT_RESPONSE(response)));
-}
-
-PyObject *logout_response_new_from_query(PyObject *self, PyObject *args) {
-  const xmlChar *query;
-
-  LassoNode *response = NULL;
-
-  if (CheckArgs(args, "S:logout_response_new_from_request_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:logout_response_new_from_request_query",
-			 &query))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_logout_response_new_from_query(query);
+  response = lasso_logout_response_new_from_export(request_export, export_type);
 
   return (LassoLogoutResponse_wrap(LASSO_LOGOUT_RESPONSE(response)));
 }
diff --git a/python/protocols/py_logout_response.h b/python/protocols/py_logout_response.h
index 04d1d22e..5e265c04 100644
--- a/python/protocols/py_logout_response.h
+++ b/python/protocols/py_logout_response.h
@@ -35,10 +35,7 @@ typedef struct {
 #define LassoLogoutResponse_get(v) (((v) == Py_None) ? NULL : (((LassoLogoutResponse_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
 PyObject *LassoLogoutResponse_wrap(LassoLogoutResponse *response);
 
-PyObject *logout_response_new_from_request_soap(PyObject *self, PyObject *args);
-PyObject *logout_response_new_from_soap(PyObject *self, PyObject *args);
-PyObject *logout_response_new_from_dump(PyObject *self, PyObject *args);
-PyObject *logout_response_new_from_request_query(PyObject *self, PyObject *args);
-PyObject *logout_response_new_from_query(PyObject *self, PyObject *args);
+PyObject *logout_response_new_from_request_export(PyObject *self, PyObject *args);
+PyObject *logout_response_new_from_export(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_LOGOUT_RESPONSE_H__ */