name identifer mapping c and python binding updates

4 files changed, 125 insertions, 12 deletions

diff --git a/python/protocols/py_name_identifier_mapping_request.c b/python/protocols/py_name_identifier_mapping_request.c
index 1d287fc8..975ac9b8 100644
--- a/python/protocols/py_name_identifier_mapping_request.c
+++ b/python/protocols/py_name_identifier_mapping_request.c
@@ -62,3 +62,37 @@ PyObject *name_identifier_mapping_request_new(PyObject *self, PyObject *args) {
 
   return (LassoNameIdentifierMappingRequest_wrap(LASSO_NAME_IDENTIFIER_MAPPING_REQUEST(request)));
 }
+
+PyObject *name_identifier_mapping_request_new_from_soap(PyObject *self, PyObject *args) {
+  const xmlChar *soap_buffer;
+
+  LassoNode     *request;
+
+  if (CheckArgs(args, "S:name_identifier_mapping_request_new_from_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:name_identifier_mapping_request_new_from_soap",
+			 &soap_buffer))
+      return NULL;
+  }
+  else return NULL;
+
+  request = lasso_name_identifier_mapping_request_new_from_soap(soap_buffer);
+
+  return (LassoNameIdentifierMappingRequest_wrap(LASSO_NAME_IDENTIFIER_MAPPING_REQUEST(request)));
+}
+
+PyObject *name_identifier_mapping_request_new_from_query(PyObject *self, PyObject *args) {
+  const xmlChar *query;
+
+  LassoNode     *request;
+
+  if (CheckArgs(args, "S:name_identifier_mapping_request_new_from_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:name_identifier_mapping_request_new_from_query",
+			 &query))
+      return NULL;
+  }
+  else return NULL;
+
+  request = lasso_name_identifier_mapping_request_new_from_query(query);
+
+  return (LassoNameIdentifierMappingRequest_wrap(LASSO_NAME_IDENTIFIER_MAPPING_REQUEST(request)));
+}
diff --git a/python/protocols/py_name_identifier_mapping_request.h b/python/protocols/py_name_identifier_mapping_request.h
index f9e17f39..647e6e80 100644
--- a/python/protocols/py_name_identifier_mapping_request.h
+++ b/python/protocols/py_name_identifier_mapping_request.h
@@ -37,5 +37,7 @@ typedef struct {
 PyObject *LassoNameIdentifierMappingRequest_wrap(LassoNameIdentifierMappingRequest *request);
 
 PyObject *name_identifier_mapping_request_new(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_request_new_from_soap(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_request_new_from_query(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_NAME_IDENTIFIER_MAPPING_REQUEST_H__ */
diff --git a/python/protocols/py_name_identifier_mapping_response.c b/python/protocols/py_name_identifier_mapping_response.c
index 6cd90c57..39d8798c 100644
--- a/python/protocols/py_name_identifier_mapping_response.c
+++ b/python/protocols/py_name_identifier_mapping_response.c
@@ -42,24 +42,97 @@ PyObject *LassoNameIdentifierMappingResponse_wrap(LassoNameIdentifierMappingResp
 
 /******************************************************************************/
 
-PyObject *name_identifier_mapping_response_new(PyObject *self, PyObject *args) {
-  const xmlChar      *providerID;
-  const xmlChar      *statusCodeValue;
-  PyObject           *request_obj;
+PyObject *name_identifier_mapping_response_new_from_request_soap(PyObject *self, PyObject *args) {
+  const xmlChar *request_soap_dump;
+  const xmlChar *providerID;
+  const xmlChar *status_code_value;
 
-  LassoNode *response;
+  LassoNode *response = NULL;
 
-  if (CheckArgs(args, "SSO:name_identifier_mapping_response_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "ssO:name_identifier_mapping_response_new",
+  if (CheckArgs(args, "SSS:name_identifier_mapping_response_new_from_request_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "sss:name_identifier_mapping_response_new_from_request_soap",
+			 &request_soap_dump,
 			 &providerID,
-			 &statusCodeValue, &request_obj))
+			 &status_code_value))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_name_identifier_mapping_response_new(providerID,
-							statusCodeValue,
-							LassoNameIdentifierMappingRequest_get(request_obj));
+  response = lasso_name_identifier_mapping_response_new_from_request_soap(request_soap_dump,
+									  providerID,
+									  status_code_value);
+
+  return (LassoNameIdentifierMappingResponse_wrap(LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE(response)));
+}
+
+PyObject *name_identifier_mapping_response_new_from_soap(PyObject *self, PyObject *args) {
+  const xmlChar *response_soap_dump;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:name_identifier_mapping_response_new_from_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:name_identifier_mapping_response_new_from_soap",
+			 &response_soap_dump))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_name_identifier_mapping_response_new_from_soap(response_soap_dump);
+
+  return (LassoNameIdentifierMappingResponse_wrap(LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE(response)));
+}
+
+PyObject *name_identifier_mapping_response_new_from_dump(PyObject *self, PyObject *args) {
+  const xmlChar *dump;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:name_identifier_mapping_response_new_from_dump")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:name_identifier_mapping_response_new_from_dump",
+			 &dump))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_name_identifier_mapping_response_new_from_soap(dump);
+
+  return (LassoNameIdentifierMappingResponse_wrap(LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE(response)));
+}
+
+PyObject *name_identifier_mapping_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:name_identifier_mapping_response_new_from_request_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "sss:name_identifier_mapping_response_new_from_request_query",
+			 &query,
+			 &providerID,
+			 &status_code_value))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_name_identifier_mapping_response_new_from_request_query(query, providerID, status_code_value);
+
+  return (LassoNameIdentifierMappingResponse_wrap(LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE(response)));
+}
+
+PyObject *name_identifier_mapping_response_new_from_query(PyObject *self, PyObject *args) {
+  const xmlChar *query;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:name_identifier_mapping_response_new_from_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:name_identifier_mapping_response_new_from_query",
+			 &query))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_name_identifier_mapping_response_new_from_query(query);
 
   return (LassoNameIdentifierMappingResponse_wrap(LASSO_NAME_IDENTIFIER_MAPPING_RESPONSE(response)));
 }
diff --git a/python/protocols/py_name_identifier_mapping_response.h b/python/protocols/py_name_identifier_mapping_response.h
index 50ac6a42..f2fc0ef1 100644
--- a/python/protocols/py_name_identifier_mapping_response.h
+++ b/python/protocols/py_name_identifier_mapping_response.h
@@ -35,6 +35,10 @@ typedef struct {
 #define LassoNameIdentifierMappingResponse_get(v) (((v) == Py_None) ? NULL : (((LassoNameIdentifierMappingResponse_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
 PyObject *LassoNameIdentifierMappingResponse_wrap(LassoNameIdentifierMappingResponse *response);
 
-PyObject *name_identifier_mapping_response_new(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_response_new_from_request_soap(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_response_new_from_soap(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_response_new_from_dump(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_response_new_from_request_query(PyObject *self, PyObject *args);
+PyObject *name_identifier_mapping_response_new_from_query(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_NAME_IDENTIFIER_MAPPING_RESPONSE_H__ */