update of register name identifier

4 files changed, 37 insertions, 105 deletions

diff --git a/python/protocols/py_register_name_identifier_request.c b/python/protocols/py_register_name_identifier_request.c
index e5a484c4..0deba7cf 100644
--- a/python/protocols/py_register_name_identifier_request.c
+++ b/python/protocols/py_register_name_identifier_request.c
@@ -92,42 +92,29 @@ PyObject *register_name_identifier_request_rename_attributes_for_query(PyObject
   }
   else return NULL;
      
-  lasso_register_name_identifier_rename_attributes_for_query(LassoRegisterNameIdentifierRequest_get(request_obj));
+  lasso_register_name_identifier_request_rename_attributes_for_query(LassoRegisterNameIdentifierRequest_get(request_obj));
   
   Py_INCREF(Py_None);
   return (Py_None);
 }
 
-PyObject *register_name_identifier_request_new_from_soap(PyObject *self, PyObject *args) {
-  const xmlChar *soap_buffer;
-
-  LassoNode     *request;
+PyObject *register_name_identifier_request_new_from_export(PyObject *self, PyObject *args) {
+  gchar     *soap_buffer;
+  LassoNode *request;
+  gint       type;
 
-  if (CheckArgs(args, "S:register_name_identifier_request_new_from_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_request_new_from_soap",
-			 &soap_buffer))
+  if (CheckArgs(args, "SS:register_name_identifier_request_new_from_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ss:register_name_identifier_request_new_from_export",
+			 &soap_buffer, &type))
       return NULL;
   }
   else return NULL;
 
-  request = lasso_register_name_identifier_request_new_from_soap(soap_buffer);
-
-  return (LassoRegisterNameIdentifierRequest_wrap(LASSO_REGISTER_NAME_IDENTIFIER_REQUEST(request)));
-}
-
-PyObject *register_name_identifier_request_new_from_query(PyObject *self, PyObject *args) {
-  const xmlChar *query;
-
-  LassoNode     *request;
-
-  if (CheckArgs(args, "S:register_name_identifier_request_new_from_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_request_new_from_query",
-			 &query))
-      return NULL;
+  request = lasso_register_name_identifier_request_new_from_export(soap_buffer, type);
+  if(request==NULL){
+    Py_INCREF(Py_None);
+    return (Py_None);
   }
-  else return NULL;
-
-  request = lasso_register_name_identifier_request_new_from_query(query);
 
   return (LassoRegisterNameIdentifierRequest_wrap(LASSO_REGISTER_NAME_IDENTIFIER_REQUEST(request)));
 }
diff --git a/python/protocols/py_register_name_identifier_request.h b/python/protocols/py_register_name_identifier_request.h
index c62105fa..2d04809a 100644
--- a/python/protocols/py_register_name_identifier_request.h
+++ b/python/protocols/py_register_name_identifier_request.h
@@ -37,9 +37,9 @@ typedef struct {
 PyObject *LassoRegisterNameIdentifierRequest_wrap(LassoRegisterNameIdentifierRequest *request);
 
 PyObject *register_name_identifier_request_new(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_request_rename_attributes_for_query(PyObject *self, PyObject *args);
 
-PyObject *register_name_identifier_request_new_from_soap(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_request_new_from_query(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_request_new_from_export(PyObject *self, PyObject *args);
+
+PyObject *register_name_identifier_request_rename_attributes_for_query(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_REGISTER_NAME_IDENTIFIER_REQUEST_H__ */
diff --git a/python/protocols/py_register_name_identifier_response.c b/python/protocols/py_register_name_identifier_response.c
index 7fc8c0da..5547dd17 100644
--- a/python/protocols/py_register_name_identifier_response.c
+++ b/python/protocols/py_register_name_identifier_response.c
@@ -42,97 +42,46 @@ PyObject *LassoRegisterNameIdentifierResponse_wrap(LassoRegisterNameIdentifierRe
 
 /******************************************************************************/
 
-PyObject *register_name_identifier_response_new_from_request_soap(PyObject *self, PyObject *args) {
-  const xmlChar *request_soap_dump;
-  const xmlChar *providerID;
-  const xmlChar *status_code_value;
+PyObject *register_name_identifier_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:register_name_identifier_response_new_from_request_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "sss:register_name_identifier_response_new_from_request_soap",
-			 &request_soap_dump,
+  if (CheckArgs(args, "SSSS:register_name_identifier_response_new_from_request_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ssss:register_name_identifier_response_new_from_request_export",
+			 &request_export,
+			 &export_type,
 			 &providerID,
 			 &status_code_value))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_register_name_identifier_response_new_from_request_soap(request_soap_dump,
-									   providerID,
-									   status_code_value);
+  response = lasso_register_name_identifier_response_new_from_request_export(request_export,
+									     export_type,
+									     providerID,
+									     status_code_value);
 
   return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
 }
 
-PyObject *register_name_identifier_response_new_from_soap(PyObject *self, PyObject *args) {
-  const xmlChar *request_soap_dump;
+PyObject *register_name_identifier_response_new_from_export(PyObject *self, PyObject *args) {
+  gchar *request_export;
+  gint   export_type;
 
   LassoNode *response = NULL;
 
-  if (CheckArgs(args, "S:register_name_identifier_response_new_from_soap")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_soap",
-			 &request_soap_dump))
+  if (CheckArgs(args, "SS:register_name_identifier_response_new_from_export")) {
+    if(!PyArg_ParseTuple(args, (char *) "ss:register_name_identifier_response_new_from_export",
+			 &request_export, &export_type))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_register_name_identifier_response_new_from_soap(request_soap_dump);
-
-  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
-}
-
-PyObject *register_name_identifier_response_new_from_dump(PyObject *self, PyObject *args) {
-  const xmlChar *dump;
-
-  LassoNode *response = NULL;
-
-  if (CheckArgs(args, "S:register_name_identifier_response_new_from_dump")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_dump",
-			 &dump))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_register_name_identifier_response_new_from_soap(dump);
-
-  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
-}
-
-PyObject *register_name_identifier_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:register_name_identifier_response_new_from_request_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "sss:register_name_identifier_response_new_from_request_query",
-			 &query,
-			 &providerID,
-			 &status_code_value))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_register_name_identifier_response_new_from_request_query(query, providerID, status_code_value);
-
-  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
-}
-
-PyObject *register_name_identifier_response_new_from_query(PyObject *self, PyObject *args) {
-  const xmlChar *query;
-
-  LassoNode *response = NULL;
-
-  if (CheckArgs(args, "S:register_name_identifier_response_new_from_request_query")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_request_query",
-			 &query))
-      return NULL;
-  }
-  else return NULL;
-
-  response = lasso_register_name_identifier_response_new_from_query(query);
+  response = lasso_register_name_identifier_response_new_from_export(request_export, export_type);
 
   return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
 }
diff --git a/python/protocols/py_register_name_identifier_response.h b/python/protocols/py_register_name_identifier_response.h
index f66d2059..0d6aad5a 100644
--- a/python/protocols/py_register_name_identifier_response.h
+++ b/python/protocols/py_register_name_identifier_response.h
@@ -36,11 +36,7 @@ typedef struct {
 #define LassoRegisterNameIdentifierResponse_get(v) (((v) == Py_None) ? NULL : (((LassoRegisterNameIdentifierResponse_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
 PyObject *LassoRegisterNameIdentifierResponse_wrap(LassoRegisterNameIdentifierResponse *response);
 
-PyObject *register_name_identifier_response_new_from_request_soap(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_response_new_from_soap(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_response_new_from_dump(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_response_new_from_request_query(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_response_new_from_query(PyObject *self, PyObject *args);
-
+PyObject *register_name_identifier_response_new_from_request_export(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_export(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_REGISTER_NAME_IDENTIFIER_RESPONSE_H__ */