certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] applications/PyHLA/hla/_rti federateambassador....


From: certi-cvs
Subject: [certi-cvs] applications/PyHLA/hla/_rti federateambassador....
Date: Thu, 02 Oct 2008 10:04:05 +0000

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Petr Gotthard <gotthardp>       08/10/02 10:04:04

Modified files:
        PyHLA/hla/_rti : federateambassador.cpp handles.cpp handles.h 
                         rtiambassador.cpp 

Log message:
        Additional RTI ambassador wrapper functions implemented. (75% done)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/federateambassador.cpp?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/handles.cpp?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/handles.h?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/rtiambassador.cpp?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: federateambassador.cpp
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/federateambassador.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- federateambassador.cpp      1 Oct 2008 21:17:18 -0000       1.3
+++ federateambassador.cpp      2 Oct 2008 10:04:04 -0000       1.4
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: federateambassador.cpp,v 1.3 2008/10/01 21:17:18 gotthardp Exp $
+ * $Id: federateambassador.cpp,v 1.4 2008/10/02 10:04:04 gotthardp Exp $
  */
 
 // note: you must include Python.h before any standard headers are included
@@ -312,8 +312,8 @@
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleValuePairSet_ToPython, &theAttributes,
         theTag,
-        RtiULongHandle_FromULong(&RtiOrderTypeType, 
theAttributes.getOrderType(0)),
-        RtiULongHandle_FromULong(&RtiTransportTypeType, 
theAttributes.getTransportType(0)),
+        RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theAttributes.getOrderType(0)),
+        RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theAttributes.getTransportType(0)),
         time.getTime(),
         EventRetractionHandle_ToPython, &theHandle);
 
@@ -337,8 +337,8 @@
         RtiObjectHandle_ToPython, &theObject,
         AttributeHandleValuePairSet_ToPython, &theAttributes,
         theTag,
-        RtiULongHandle_FromULong(&RtiOrderTypeType, 
theAttributes.getOrderType(0)),
-        RtiULongHandle_FromULong(&RtiTransportTypeType, 
theAttributes.getTransportType(0)));
+        RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theAttributes.getOrderType(0)),
+        RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theAttributes.getTransportType(0)));
 
     if(PyObject *exception = PyErr_Occurred()) {
         CATCH_PYTHON_EXCEPTION(exception, ObjectNotKnown)
@@ -364,8 +364,8 @@
         RtiInteractionClassHandle_ToPython, &theInteraction,
         ParameterHandleValuePairSet_ToPython, &theParameters,
         theTag,
-        RtiULongHandle_FromULong(&RtiOrderTypeType, 
theParameters.getOrderType()),
-        RtiULongHandle_FromULong(&RtiTransportTypeType, 
theParameters.getTransportType()),
+        RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theParameters.getOrderType()),
+        RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theParameters.getTransportType()),
         time.getTime(),
         EventRetractionHandle_ToPython, &theHandle);
 
@@ -388,8 +388,8 @@
         RtiInteractionClassHandle_ToPython, &theInteraction,
         ParameterHandleValuePairSet_ToPython, &theParameters,
         theTag,
-        RtiULongHandle_FromULong(&RtiOrderTypeType, 
theParameters.getOrderType()),
-        RtiULongHandle_FromULong(&RtiTransportTypeType, 
theParameters.getTransportType()));
+        RtiULongHandle_FromULong(&RtiOrderingHandleType, 
theParameters.getOrderType()),
+        RtiULongHandle_FromULong(&RtiTransportationHandleType, 
theParameters.getTransportType()));
 
     if(PyObject *exception = PyErr_Occurred()) {
         CATCH_PYTHON_EXCEPTION(exception, InteractionClassNotKnown)
@@ -827,4 +827,4 @@
     PyModule_AddObject(module, "FederateAmbassador", (PyObject 
*)&FederateAmbassadorObjectType);
 }
 
-// $Id: federateambassador.cpp,v 1.3 2008/10/01 21:17:18 gotthardp Exp $
+// $Id: federateambassador.cpp,v 1.4 2008/10/02 10:04:04 gotthardp Exp $

Index: handles.cpp
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/handles.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- handles.cpp 1 Oct 2008 21:08:58 -0000       1.2
+++ handles.cpp 2 Oct 2008 10:04:04 -0000       1.3
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: handles.cpp,v 1.2 2008/10/01 21:08:58 gotthardp Exp $
+ * $Id: handles.cpp,v 1.3 2008/10/02 10:04:04 gotthardp Exp $
  */
 
 // note: you must include Python.h before any standard headers are included
@@ -56,6 +56,18 @@
     return RtiULongHandle_FromULong(&RtiObjectClassHandleType, *value);
 }
 
+int RtiInteractionClassHandle_FromPython(RtiULongHandleObject *value, 
RTI::InteractionClassHandle *addr)
+{
+    if(value == NULL || !PyObject_TypeCheck(value, 
&RtiInteractionClassHandleType)) {
+        PyErr_SetString(PyExc_TypeError,
+            "InteractionClassHandle object required");
+        return 0; // failure
+    }
+
+    *addr = value->ob_ival;
+    return 1; // success
+}
+
 PyObject *RtiInteractionClassHandle_ToPython(RTI::InteractionClassHandle 
*value)
 {
     return RtiULongHandle_FromULong(&RtiInteractionClassHandleType, *value);
@@ -90,6 +102,11 @@
     return 1; // success
 }
 
+PyObject *RtiParameterHandle_ToPython(RTI::ParameterHandle *value)
+{
+    return RtiULongHandle_FromULong(&RtiParameterHandleType, *value);
+}
+
 int RtiObjectHandle_FromPython(RtiULongHandleObject *value, RTI::ObjectHandle 
*result)
 {
     if(result == NULL || !PyObject_TypeCheck(value, &RtiObjectHandleType)) {
@@ -113,6 +130,42 @@
 }
 
 int
+RtiOrderingHandle_FromPython(RtiULongHandleObject *value, RTI::OrderingHandle 
*result)
+{
+    if(result == NULL || !PyObject_TypeCheck(value, &RtiOrderingHandleType)) {
+        PyErr_SetString(PyExc_TypeError,
+            "OrderingHandle object required");
+        return 0; // failure
+    }
+
+    *result = value->ob_ival;
+    return 1; // success
+}
+
+PyObject *RtiOrderingHandle_ToPython(RTI::OrderingHandle *value)
+{
+    return RtiULongHandle_FromULong(&RtiOrderingHandleType, *value);
+}
+
+int
+RtiTransportationHandle_FromPython(RtiULongHandleObject *value, 
RTI::TransportationHandle *result)
+{
+    if(result == NULL || !PyObject_TypeCheck(value, 
&RtiTransportationHandleType)) {
+        PyErr_SetString(PyExc_TypeError,
+            "TransportationHandle object required");
+        return 0; // failure
+    }
+
+    *result = value->ob_ival;
+    return 1; // success
+}
+
+PyObject *RtiTransportationHandle_ToPython(RTI::TransportationHandle *value)
+{
+    return RtiULongHandle_FromULong(&RtiTransportationHandleType, *value);
+}
+
+int
 AttributeHandleSet_FromPython(PyObject *value, RTI::AttributeHandleSet 
**result)
 {
     if(value == NULL || !PySequence_Check(value)) {
@@ -459,10 +512,10 @@
     "FederateHandle",          /* tp_doc */
 };
 
-PyTypeObject RtiOrderTypeType = {
+PyTypeObject RtiOrderingHandleType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /* ob_size */
-    MODULE_NAME ".OrderType", /* tp_name */
+    MODULE_NAME ".OrderingHandle", /* tp_name */
     sizeof(RtiULongHandleObject), /* tp_basicsize */
     0,                         /* tp_itemsize */
     0,                         /* tp_dealloc */
@@ -481,13 +534,13 @@
     0,                         /* tp_setattro */
     0,                         /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,        /* tp_flags */
-    "OrderType",               /* tp_doc */
+    "OrderingHandle",               /* tp_doc */
 };
 
-PyTypeObject RtiTransportTypeType = {
+PyTypeObject RtiTransportationHandleType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /* ob_size */
-    MODULE_NAME ".TransportType", /* tp_name */
+    MODULE_NAME ".TransportationHandle", /* tp_name */
     sizeof(RtiULongHandleObject), /* tp_basicsize */
     0,                         /* tp_itemsize */
     0,                         /* tp_dealloc */
@@ -506,7 +559,7 @@
     0,                         /* tp_setattro */
     0,                         /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,        /* tp_flags */
-    "TransportType",           /* tp_doc */
+    "TransportationHandle",    /* tp_doc */
 };
 
 static int
@@ -647,15 +700,15 @@
     Py_INCREF(&RtiFederateHandleType);
     PyModule_AddObject(module, "FederateHandle", (PyObject 
*)&RtiFederateHandleType);
 
-    if (PyType_Ready(&RtiOrderTypeType) < 0)
+    if (PyType_Ready(&RtiOrderingHandleType) < 0)
         return;
-    Py_INCREF(&RtiOrderTypeType);
-    PyModule_AddObject(module, "OrderType", (PyObject *)&RtiOrderTypeType);
+    Py_INCREF(&RtiOrderingHandleType);
+    PyModule_AddObject(module, "OrderingHandle", (PyObject 
*)&RtiOrderingHandleType);
 
-    if (PyType_Ready(&RtiTransportTypeType) < 0)
+    if (PyType_Ready(&RtiTransportationHandleType) < 0)
         return;
-    Py_INCREF(&RtiTransportTypeType);
-    PyModule_AddObject(module, "TransportType", (PyObject 
*)&RtiTransportTypeType);
+    Py_INCREF(&RtiTransportationHandleType);
+    PyModule_AddObject(module, "TransportationHandle", (PyObject 
*)&RtiTransportationHandleType);
 
     if (PyType_Ready(&EventRetractionHandleType) < 0)
         return;
@@ -663,4 +716,4 @@
     PyModule_AddObject(module, "EventRetractionHandle", (PyObject 
*)&EventRetractionHandleType);
 }
 
-// $Id: handles.cpp,v 1.2 2008/10/01 21:08:58 gotthardp Exp $
+// $Id: handles.cpp,v 1.3 2008/10/02 10:04:04 gotthardp Exp $

Index: handles.h
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/handles.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- handles.h   1 Oct 2008 21:08:58 -0000       1.2
+++ handles.h   2 Oct 2008 10:04:04 -0000       1.3
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: handles.h,v 1.2 2008/10/01 21:08:58 gotthardp Exp $
+ * $Id: handles.h,v 1.3 2008/10/02 10:04:04 gotthardp Exp $
  */
 
 #ifndef RTI_HANDLES_H
@@ -31,26 +31,34 @@
 extern PyTypeObject RtiObjectHandleType;
 extern PyTypeObject RtiFederateHandleType;
 
-extern PyTypeObject RtiOrderTypeType;
-extern PyTypeObject RtiTransportTypeType;
+extern PyTypeObject RtiOrderingHandleType;
+extern PyTypeObject RtiTransportationHandleType;
 
 PyObject* RtiULongHandle_FromULong(PyTypeObject *type, unsigned long val);
 
 int RtiObjectClassHandle_FromPython(RtiULongHandleObject *value, 
RTI::ObjectClassHandle *addr);
 PyObject *RtiObjectClassHandle_ToPython(RTI::ObjectClassHandle *value);
 
+int RtiInteractionClassHandle_FromPython(RtiULongHandleObject *value, 
RTI::InteractionClassHandle *addr);
 PyObject *RtiInteractionClassHandle_ToPython(RTI::InteractionClassHandle 
*value);
 
 int RtiAttributeHandle_FromPython(RtiULongHandleObject *value, 
RTI::AttributeHandle *result);
 PyObject *RtiAttributeHandle_ToPython(RTI::AttributeHandle *value);
 
 int RtiParameterHandle_FromPython(RtiULongHandleObject *value, 
RTI::ParameterHandle *result);
+PyObject *RtiParameterHandle_ToPython(RTI::ParameterHandle *value);
 
 int RtiObjectHandle_FromPython(RtiULongHandleObject *value, RTI::ObjectHandle 
*result);
 PyObject *RtiObjectHandle_ToPython(RTI::ObjectHandle *value);
 
 PyObject *RtiFederateHandle_ToPython(RTI::FederateHandle *value);
 
+int RtiOrderingHandle_FromPython(RtiULongHandleObject *value, 
RTI::OrderingHandle *result);
+PyObject *RtiOrderingHandle_ToPython(RTI::OrderingHandle *value);
+
+int RtiTransportationHandle_FromPython(RtiULongHandleObject *value, 
RTI::TransportationHandle *result);
+PyObject *RtiTransportationHandle_ToPython(RTI::TransportationHandle *value);
+
 int AttributeHandleSet_FromPython(PyObject *value, RTI::AttributeHandleSet 
**result);
 PyObject *AttributeHandleSet_ToPython(RTI::AttributeHandleSet *value);
 
@@ -74,4 +82,4 @@
 
 #endif // RTI_HANDLES_H
 
-// $Id: handles.h,v 1.2 2008/10/01 21:08:58 gotthardp Exp $
+// $Id: handles.h,v 1.3 2008/10/02 10:04:04 gotthardp Exp $

Index: rtiambassador.cpp
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/rtiambassador.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- rtiambassador.cpp   25 Sep 2008 17:17:38 -0000      1.1
+++ rtiambassador.cpp   2 Oct 2008 10:04:04 -0000       1.2
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rtiambassador.cpp,v 1.1 2008/09/25 17:17:38 gotthardp Exp $
+ * $Id: rtiambassador.cpp,v 1.2 2008/10/02 10:04:04 gotthardp Exp $
  */
 
 // note: you must include Python.h before any standard headers are included
@@ -232,11 +232,12 @@
 rtia_requestFederationSave(RTIAmbassadorObject *self, PyObject *args)
 {
     const char *label;
-//    double theTime; // optional
     RTIfedTime theTime; // optional
 
-//    if(!PyArg_ParseTuple(args, "s|d", &label, &theTime))
-//        return NULL;
+    if(!PyArg_ParseTuple(args, "s|O&",
+        &label,
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
 
     try {
         size_t size = PyTuple_Size(args);
@@ -433,9 +434,14 @@
 {
     RTI::InteractionClassHandle theInteraction;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiInteractionClassHandle_FromPython, &theInteraction))
+        return NULL;
+
     try {
         self->ob_rtia->publishInteractionClass(theInteraction);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -453,9 +459,14 @@
 {
     RTI::InteractionClassHandle theInteraction;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiInteractionClassHandle_FromPython, &theInteraction))
+        return NULL;
+
     try {
         self->ob_rtia->unpublishInteractionClass(theInteraction);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionClassNotPublished)
@@ -530,11 +541,18 @@
 rtia_subscribeInteractionClass(RTIAmbassadorObject *self, PyObject *args)
 {
     RTI::InteractionClassHandle theClass;
-    RTI::Boolean active = RTI::RTI_TRUE;
+    bool pyActive = true;
+
+    if(!PyArg_ParseTuple(args, "O&|b",
+        RtiInteractionClassHandle_FromPython, &theClass,
+        &pyActive))
+        return NULL;
 
     try {
+        RTI::Boolean active = pyActive ? RTI::RTI_TRUE : RTI::RTI_FALSE;
         self->ob_rtia->subscribeInteractionClass(theClass, active);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -553,9 +571,14 @@
 {
     RTI::InteractionClassHandle theClass;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiInteractionClassHandle_FromPython, &theClass))
+        return NULL;
+
     try {
         self->ob_rtia->unsubscribeInteractionClass(theClass);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionClassNotSubscribed)
@@ -610,32 +633,25 @@
 {
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleValuePairSet *theAttributes;
-    RTIfedTime theTime; // optional
     const char *theTag;
+    RTIfedTime theTime; // optional
 
-    if(!PyArg_ParseTuple(args, "O&O&s",
+    if(!PyArg_ParseTuple(args, "O&O&s|O&",
         RtiObjectHandle_FromPython, &theObject,
         AttributeHandleValuePairSet_FromPython, &theAttributes,
-        &theTag))
+        &theTag,
+        RTIfedTime_FromPython, &theTime))
         return NULL;
 
     try {
+        if(PyTuple_Size(args) == 3) {
         self->ob_rtia->updateAttributeValues(theObject, *theAttributes, 
theTag);
-
         return Py_None;
     }
-    CATCH_RTI_EXCEPTION(ObjectNotKnown)
-    CATCH_RTI_EXCEPTION(AttributeNotDefined)
-    CATCH_RTI_EXCEPTION(AttributeNotOwned)
-    CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
-    CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
-    CATCH_RTI_EXCEPTION(SaveInProgress)
-    CATCH_RTI_EXCEPTION(RestoreInProgress)
-    CATCH_RTI_EXCEPTION2(RTI::Exception, rti_RTIInternalError)
-
-    try {
+        else {
         RTI::EventRetractionHandle result = 
self->ob_rtia->updateAttributeValues(theObject, *theAttributes, theTime, 
theTag);
-
+            return EventRetractionHandle_ToPython(&result);
+        }
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -656,25 +672,25 @@
 {
     RTI::InteractionClassHandle theInteraction;
     RTI::ParameterHandleValuePairSet *theParameters;
-    RTIfedTime theTime; // optional
     const char *theTag;
+    RTIfedTime theTime; // optional
+
+    if(!PyArg_ParseTuple(args, "O&O&s|d",
+        RtiInteractionClassHandle_FromPython, &theInteraction,
+        ParameterHandleValuePairSet_FromPython, &theParameters,
+        &theTag,
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
 
     try {
+        if(PyTuple_Size(args) == 3) {
         self->ob_rtia->sendInteraction(theInteraction, *theParameters, theTag);
-
+            return Py_None;
     }
-    CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
-    CATCH_RTI_EXCEPTION(InteractionClassNotPublished)
-    CATCH_RTI_EXCEPTION(InteractionParameterNotDefined)
-    CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
-    CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
-    CATCH_RTI_EXCEPTION(SaveInProgress)
-    CATCH_RTI_EXCEPTION(RestoreInProgress)
-    CATCH_RTI_EXCEPTION2(RTI::Exception, rti_RTIInternalError)
-
-    try {
+        else {
         RTI::EventRetractionHandle result = 
self->ob_rtia->sendInteraction(theInteraction, *theParameters, theTime, theTag);
-
+            return EventRetractionHandle_ToPython(&result);
+        }
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionClassNotPublished)
@@ -704,8 +720,7 @@
         return NULL;
 
     try {
-        size_t size = PyTuple_Size(args);
-        if(size == 2) {
+        if(PyTuple_Size(args) == 2) {
             self->ob_rtia->deleteObjectInstance(theObject, theTag);
             return Py_None;
         }
@@ -732,9 +747,14 @@
 {
     RTI::ObjectHandle theObject;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiObjectHandle_FromPython, &theObject))
+        return NULL;
+
     try {
         self->ob_rtia->localDeleteObjectInstance(theObject);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(FederateOwnsAttributes)
@@ -755,9 +775,16 @@
     RTI::AttributeHandleSet *theAttributes;
     RTI::TransportationHandle theType;
 
+    if(!PyArg_ParseTuple(args, "O&O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes,
+        RtiTransportationHandle_FromPython, &theType))
+        return NULL;
+
     try {
         self->ob_rtia->changeAttributeTransportationType(theObject, 
*theAttributes, theType);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -779,9 +806,15 @@
     RTI::InteractionClassHandle theClass;
     RTI::TransportationHandle theType;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiInteractionClassHandle_FromPython, &theClass,
+        RtiTransportationHandle_FromPython, &theType))
+        return NULL;
+
     try {
         self->ob_rtia->changeInteractionTransportationType(theClass, theType);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionClassNotPublished)
@@ -802,9 +835,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         self->ob_rtia->requestObjectAttributeValueUpdate(theObject, 
*theAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -823,9 +862,15 @@
     RTI::ObjectClassHandle theClass;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectClassHandle_FromPython, &theClass,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         self->ob_rtia->requestClassAttributeValueUpdate(theClass, 
*theAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectClassNotDefined)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -847,9 +892,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         self->ob_rtia->unconditionalAttributeOwnershipDivestiture(theObject, 
*theAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -871,9 +922,16 @@
     RTI::AttributeHandleSet *theAttributes;
     const char *theTag;
 
+    if(!PyArg_ParseTuple(args, "O&O&s",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes,
+        &theTag))
+        return NULL;
+
     try {
         self->ob_rtia->negotiatedAttributeOwnershipDivestiture(theObject, 
*theAttributes, theTag);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -896,9 +954,16 @@
     RTI::AttributeHandleSet *desiredAttributes;
     const char *theTag;
 
+    if(!PyArg_ParseTuple(args, "O&O&s",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &desiredAttributes,
+        &theTag))
+        return NULL;
+
     try {
         self->ob_rtia->attributeOwnershipAcquisition(theObject, 
*desiredAttributes, theTag);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(ObjectClassNotPublished)
@@ -921,9 +986,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *desiredAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &desiredAttributes))
+        return NULL;
+
     try {
         self->ob_rtia->attributeOwnershipAcquisitionIfAvailable(theObject, 
*desiredAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(ObjectClassNotPublished)
@@ -947,9 +1018,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         RTI::AttributeHandleSet *result = 
self->ob_rtia->attributeOwnershipReleaseResponse(theObject, *theAttributes);
 
+        return AttributeHandleSet_ToPython(result);
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -971,9 +1048,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         
self->ob_rtia->cancelNegotiatedAttributeOwnershipDivestiture(theObject, 
*theAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -995,9 +1078,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandleSet *theAttributes;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes))
+        return NULL;
+
     try {
         self->ob_rtia->cancelAttributeOwnershipAcquisition(theObject, 
*theAttributes);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -1019,9 +1108,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandle theAttribute;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        RtiAttributeHandle_FromPython, &theAttribute))
+        return NULL;
+
     try {
         self->ob_rtia->queryAttributeOwnership(theObject, theAttribute);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -1041,9 +1136,15 @@
     RTI::ObjectHandle theObject;
     RTI::AttributeHandle theAttribute;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        RtiAttributeHandle_FromPython, &theAttribute))
+        return NULL;
+
     try {
         RTI::Boolean result = 
self->ob_rtia->isAttributeOwnedByFederate(theObject, theAttribute);
 
+        return PyBool_FromLong(result);
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -1065,9 +1166,15 @@
     RTIfedTime theFederateTime;
     RTIfedTime theLookahead;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RTIfedTime_FromPython, &theFederateTime,
+        RTIfedTime_FromPython, &theLookahead))
+        return NULL;
+
     try {
         self->ob_rtia->enableTimeRegulation(theFederateTime, theLookahead);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(TimeRegulationAlreadyEnabled)
     CATCH_RTI_EXCEPTION(EnableTimeRegulationPending)
@@ -1090,6 +1197,7 @@
     try {
         self->ob_rtia->disableTimeRegulation();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(TimeRegulationWasNotEnabled)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -1108,6 +1216,7 @@
     try {
         self->ob_rtia->enableTimeConstrained();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(TimeConstrainedAlreadyEnabled)
     CATCH_RTI_EXCEPTION(EnableTimeConstrainedPending)
@@ -1128,6 +1237,7 @@
     try {
         self->ob_rtia->disableTimeConstrained();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(TimeConstrainedWasNotEnabled)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1145,9 +1255,14 @@
 {
     RTIfedTime theTime;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
+
     try {
         self->ob_rtia->timeAdvanceRequest(theTime);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidFederationTime)
     CATCH_RTI_EXCEPTION(FederationTimeAlreadyPassed)
@@ -1169,9 +1284,14 @@
 {
     RTIfedTime theTime;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
+
     try {
         self->ob_rtia->timeAdvanceRequestAvailable(theTime);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidFederationTime)
     CATCH_RTI_EXCEPTION(FederationTimeAlreadyPassed)
@@ -1193,9 +1313,14 @@
 {
     RTIfedTime theTime;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
+
     try {
         self->ob_rtia->nextEventRequest(theTime);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidFederationTime)
     CATCH_RTI_EXCEPTION(FederationTimeAlreadyPassed)
@@ -1217,9 +1342,14 @@
 {
     RTIfedTime theTime;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
+
     try {
         self->ob_rtia->nextEventRequestAvailable(theTime);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidFederationTime)
     CATCH_RTI_EXCEPTION(FederationTimeAlreadyPassed)
@@ -1241,9 +1371,14 @@
 {
     RTIfedTime theTime;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theTime))
+        return NULL;
+
     try {
         self->ob_rtia->flushQueueRequest(theTime);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidFederationTime)
     CATCH_RTI_EXCEPTION(FederationTimeAlreadyPassed)
@@ -1266,6 +1401,7 @@
     try {
         self->ob_rtia->enableAsynchronousDelivery();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(AsynchronousDeliveryAlreadyEnabled)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1284,6 +1420,7 @@
     try {
         self->ob_rtia->disableAsynchronousDelivery();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(AsynchronousDeliveryAlreadyDisabled)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1297,13 +1434,13 @@
 
 // 8.16
 static PyObject *
-rtia_queryLBTS(RTIAmbassadorObject *self, PyObject *args)
+rtia_queryLBTS(RTIAmbassadorObject *self)
 {
-    RTIfedTime theTime;
-
     try {
+        RTIfedTime theTime;
         self->ob_rtia->queryLBTS(theTime);
 
+        return PyFloat_FromDouble(theTime.getTime());
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -1316,13 +1453,13 @@
 
 // 8.17
 static PyObject *
-rtia_queryFederateTime(RTIAmbassadorObject *self, PyObject *args)
+rtia_queryFederateTime(RTIAmbassadorObject *self)
 {
-    RTIfedTime theTime;
-
     try {
+        RTIfedTime theTime;
         self->ob_rtia->queryFederateTime(theTime);
 
+        return PyFloat_FromDouble(theTime.getTime());
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -1335,13 +1472,13 @@
 
 // 8.18
 static PyObject *
-rtia_queryMinNextEventTime(RTIAmbassadorObject *self, PyObject *args)
+rtia_queryMinNextEventTime(RTIAmbassadorObject *self)
 {
-    RTIfedTime theTime;
-
     try {
+        RTIfedTime theTime;
         self->ob_rtia->queryMinNextEventTime(theTime);
 
+        return PyFloat_FromDouble(theTime.getTime());
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -1358,9 +1495,14 @@
 {
     RTIfedTime theLookahead;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RTIfedTime_FromPython, &theLookahead))
+        return NULL;
+
     try {
         self->ob_rtia->modifyLookahead(theLookahead);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidLookahead)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1374,13 +1516,13 @@
 
 // 8.20
 static PyObject *
-rtia_queryLookahead(RTIAmbassadorObject *self, PyObject *args)
+rtia_queryLookahead(RTIAmbassadorObject *self)
 {
-    RTIfedTime theTime;
-
     try {
+        RTIfedTime theTime;
         self->ob_rtia->queryLookahead(theTime);
 
+        return PyFloat_FromDouble(theTime.getTime());
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -1397,9 +1539,14 @@
 {
     RTI::EventRetractionHandle theHandle;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        EventRetractionHandle_FromPython, &theHandle))
+        return NULL;
+
     try {
         self->ob_rtia->retract(theHandle);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InvalidRetractionHandle)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1419,9 +1566,16 @@
     RTI::AttributeHandleSet *theAttributes;
     RTI::OrderingHandle theType;
 
+    if(!PyArg_ParseTuple(args, "O&O&O&",
+        RtiObjectHandle_FromPython, &theObject,
+        AttributeHandleSet_FromPython, &theAttributes,
+        RtiOrderingHandle_FromPython, &theType))
+        return NULL;
+
     try {
         self->ob_rtia->changeAttributeOrderType(theObject, *theAttributes, 
theType);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(AttributeNotDefined)
@@ -1443,9 +1597,15 @@
     RTI::InteractionClassHandle theClass;
     RTI::OrderingHandle theType;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiInteractionClassHandle_FromPython, &theClass,
+        RtiOrderingHandle_FromPython, &theType))
+        return NULL;
+
     try {
         self->ob_rtia->changeInteractionOrderType(theClass, theType);
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionClassNotPublished)
@@ -1892,9 +2052,13 @@
 {
     const char *theName;
 
+    if(!PyArg_ParseTuple(args, "s", &theName))
+        return NULL;
+
     try {
         RTI::InteractionClassHandle result = 
self->ob_rtia->getInteractionClassHandle(theName);
 
+        return RtiInteractionClassHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(NameNotFound)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1910,9 +2074,14 @@
 {
     RTI::InteractionClassHandle theHandle;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiInteractionClassHandle_FromPython, &theHandle))
+        return NULL;
+
     try {
         char *result = self->ob_rtia->getInteractionClassName(theHandle);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1929,9 +2098,15 @@
     const char *theName;
     RTI::InteractionClassHandle whichClass;
 
+    if(!PyArg_ParseTuple(args, "sO&",
+        &theName,
+        RtiInteractionClassHandle_FromPython, &whichClass))
+        return NULL;
+
     try {
         RTI::ParameterHandle result = 
self->ob_rtia->getParameterHandle(theName, whichClass);
 
+        return RtiParameterHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(NameNotFound)
@@ -1949,9 +2124,15 @@
     RTI::ParameterHandle theHandle;
     RTI::InteractionClassHandle whichClass;
 
+    if(!PyArg_ParseTuple(args, "O&O&",
+        RtiParameterHandle_FromPython, &theHandle,
+        RtiInteractionClassHandle_FromPython, &whichClass))
+        return NULL;
+
     try {
         char *result = self->ob_rtia->getParameterName(theHandle, whichClass);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(InteractionClassNotDefined)
     CATCH_RTI_EXCEPTION(InteractionParameterNotDefined)
@@ -1968,9 +2149,13 @@
 {
     const char *theName;
 
+    if(!PyArg_ParseTuple(args, "s", &theName))
+        return NULL;
+
     try {
         RTI::ObjectHandle result = 
self->ob_rtia->getObjectInstanceHandle(theName);
 
+        return RtiObjectHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -1986,9 +2171,14 @@
 {
     RTI::ObjectHandle theHandle;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiObjectHandle_FromPython, &theHandle))
+        return NULL;
+
     try {
         char *result = self->ob_rtia->getObjectInstanceName(theHandle);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2025,6 +2215,7 @@
     try {
         char *result = self->ob_rtia->getRoutingSpaceName(theHandle);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(SpaceNotDefined)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2064,6 +2255,7 @@
     try {
         char *result = self->ob_rtia->getDimensionName(theHandle, whichSpace);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(SpaceNotDefined)
     CATCH_RTI_EXCEPTION(DimensionNotDefined)
@@ -2100,9 +2292,14 @@
 {
     RTI::ObjectHandle theObject;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiObjectHandle_FromPython, &theObject))
+        return NULL;
+
     try {
         RTI::ObjectClassHandle result = 
self->ob_rtia->getObjectClass(theObject);
 
+        return RtiObjectClassHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(ObjectNotKnown)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2136,9 +2333,13 @@
 {
     const char *theName;
 
+    if(!PyArg_ParseTuple(args, "s", &theName))
+        return NULL;
+
     try {
         RTI::TransportationHandle result = 
self->ob_rtia->getTransportationHandle(theName);
 
+        return RtiTransportationHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(NameNotFound)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2154,9 +2355,14 @@
 {
     RTI::TransportationHandle theHandle;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiTransportationHandle_FromPython, &theHandle))
+        return NULL;
+
     try {
         char *result = self->ob_rtia->getTransportationName(theHandle);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(InvalidTransportationHandle)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2172,9 +2378,13 @@
 {
     const char *theName;
 
+    if(!PyArg_ParseTuple(args, "s", &theName))
+        return NULL;
+
     try {
         RTI::OrderingHandle result = self->ob_rtia->getOrderingHandle(theName);
 
+        return RtiOrderingHandle_ToPython(&result);
     }
     CATCH_RTI_EXCEPTION(NameNotFound)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2190,9 +2400,14 @@
 {
     RTI::OrderingHandle theHandle;
 
+    if(!PyArg_ParseTuple(args, "O&",
+        RtiOrderingHandle_FromPython, &theHandle))
+        return NULL;
+
     try {
         char *result = self->ob_rtia->getOrderingName(theHandle);
 
+        return PyString_FromString(result);
     }
     CATCH_RTI_EXCEPTION(InvalidOrderingHandle)
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2209,6 +2424,7 @@
     try {
         self->ob_rtia->enableClassRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2226,6 +2442,7 @@
     try {
         self->ob_rtia->disableClassRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2243,6 +2460,7 @@
     try {
         self->ob_rtia->enableAttributeRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2260,6 +2478,7 @@
     try {
         self->ob_rtia->disableAttributeRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2277,6 +2496,7 @@
     try {
         self->ob_rtia->enableAttributeScopeAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2294,6 +2514,7 @@
     try {
         self->ob_rtia->disableAttributeScopeAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2311,6 +2532,7 @@
     try {
         self->ob_rtia->enableInteractionRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2328,6 +2550,7 @@
     try {
         self->ob_rtia->disableInteractionRelevanceAdvisorySwitch();
 
+        return Py_None;
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
     CATCH_RTI_EXCEPTION(ConcurrentAccessAttempted)
@@ -2390,7 +2613,7 @@
     RTI::Region *region;
 
     try {
-//        RTI::RegionToken result = self->ob_rtia->getRegionToken(region);
+        RTI::RegionToken result = self->ob_rtia->getRegionToken(region);
 
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2407,7 +2630,7 @@
     RTI::RegionToken token;
 
     try {
-//        RTI::Region *result = self->ob_rtia->getRegion(token);
+        RTI::Region *result = self->ob_rtia->getRegion(token);
 
     }
     CATCH_RTI_EXCEPTION(FederateNotExecutionMember)
@@ -2574,19 +2797,19 @@
         (PyCFunction)rtia_disableAsynchronousDelivery, METH_NOARGS,
         ""},
     {"queryLBTS",
-        (PyCFunction)rtia_queryLBTS, METH_VARARGS,
+        (PyCFunction)rtia_queryLBTS, METH_NOARGS,
         ""},
     {"queryFederateTime",
-        (PyCFunction)rtia_queryFederateTime, METH_VARARGS,
+        (PyCFunction)rtia_queryFederateTime, METH_NOARGS,
         ""},
     {"queryMinNextEventTime",
-        (PyCFunction)rtia_queryMinNextEventTime, METH_VARARGS,
+        (PyCFunction)rtia_queryMinNextEventTime, METH_NOARGS,
         ""},
     {"modifyLookahead",
         (PyCFunction)rtia_modifyLookahead, METH_VARARGS,
         ""},
     {"queryLookahead",
-        (PyCFunction)rtia_queryLookahead, METH_VARARGS,
+        (PyCFunction)rtia_queryLookahead, METH_NOARGS,
         ""},
     {"retract",
         (PyCFunction)rtia_retract, METH_VARARGS,
@@ -2802,4 +3025,4 @@
     PyModule_AddObject(module, "RTIAmbassador", (PyObject 
*)&RTIAmbassadorObjectType);
 }
 
-// $Id: rtiambassador.cpp,v 1.1 2008/09/25 17:17:38 gotthardp Exp $
+// $Id: rtiambassador.cpp,v 1.2 2008/10/02 10:04:04 gotthardp Exp $




reply via email to

[Prev in Thread] Current Thread [Next in Thread]